possible solution for gh-28

possible solution for group hub bug gh-29
nimbusproject · Aug 12, 2011 · e1cae67 · e1cae67
1 parent 0c13f0e
commit e1cae67
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/cloudinitd/cb_iaas.py b/cloudinitd/cb_iaas.py
@@ -115,7 +115,7 @@ def _run_instance(self):
         if security_groupname:
              sec_group_a = self._con.get_all_security_groups(groupnames=[security_groupname,])
              if sec_group_a:
-                 sec_group = sec_group_a[0]
+                 sec_group = sec_group_a
 
         reservation = self._con.run_instances(image, instance_type=instance_type, key_name=key_name, security_groups=sec_group)
         instance = reservation.instances[0]
@@ -445,6 +445,7 @@ def _ec2_nimbus_validate(svc, log):
 g_validate_funcs = {}
 g_validate_funcs['nimbus'] = _iaas_nimbus_validate
 g_validate_funcs['ec2'] = _ec2_nimbus_validate
+g_validate_funcs['eucalyptus'] = _ec2_nimbus_validate
 
 def iaas_validate(svc, log=logging):
     global g_validate_funcs
@@ -483,10 +484,4 @@ def iaas_validate(svc, log=logging):
 
     return (rc, str(msgs))
 
-def _libcloud_iaas_get_con(key, secret, iaas, iaashostname=None, iaasport=None):
-    if iaas.lower() == "nimbus":
-        conn = None
-    else:
-        Driver = get_driver(Provider.Provider.EC2_US_EAST)
-        conn = Driver(key, secret)
-    return IaaSLibCloudConn(conn, driver)
+
diff --git a/cloudinitd/services.py b/cloudinitd/services.py
@@ -432,16 +432,17 @@ def _expand_attr_list(self, val):
     def _expand_attr(self, val):
         if not val:
             return val
-        pattern = re.compile('\$\{(.*?)\.(.*)\}')
+        pattern = re.compile('\$\{(.*?)\.(.*?)\}')
 
         match = pattern.search(val)
-        if match:
+        while match:
             svc_name = match.group(1)
             attr_name = match.group(2)
             if svc_name:
                 val = self._top_level.find_dep(svc_name, attr_name)
             else:
                 val = self.get_dep(attr_name)
+            match = pattern.search(val)
         return val
 
 

diff --git a/tests/plans/terminate/top.conf b/tests/plans/terminate/top.conf
@@ -15,6 +15,7 @@ allocation: env.CLOUDINITD_IAAS_ALLOCATION
 sshkeyname: env.CLOUDINITD_IAAS_SSHKEYNAME
 localsshkeypath: env.CLOUDINITD_IAAS_SSHKEY
 ssh_username: env.CLOUDINITD_SSH_USERNAME
+securitygroups: default
 
 [runlevels]
 level1: test-level1.conf