Commits

Mattias de Hollander  committed cf4686c

changed name of master instance

  • Participants
  • Parent commits 6dff79a

Comments (0)

Files changed (1)

File cm/clouds/opennebula.py

         if self.ec2_conn == None:
             log.debug("No OpenNebula Connection, creating a new one.")
             try:
-                self.ec2_conn = Client("%s:%s" % (self.on_username, self.on_password), self.on_host)
+                self.ec2_conn = Client("%s:%s" % (self.on_username, self.on_password), self.on_host, self.on_proxy)
                 self.ec2_conn.lookup = new.instancemethod(lookup, self.ec2_conn, self.ec2_conn.__class__)
                 self.ec2_conn.create_bucket = new.instancemethod(create_bucket, self.ec2_conn, self.ec2_conn.__class__)
 
                     r.instances.append(vm_instance)
                     reservations.append(r)
             except TypeError :
-                if vm_instance.name.strip() == "Galaxy_Main":
+                # TODO: don't hardcode the name of the master instance
+                #if vm_instance.name.strip() == "Galaxy_Main":
+                if vm_instance.name.strip() == "one-1592":
                     r = Reservations()
                     vm_instance.add_tag = new.instancemethod(add_tag, vm_instance, vm_instance.__class__)
                     vm_instance.update = new.instancemethod(update, vm_instance, vm_instance.__class__)