Merge lp:~corey.bryant/charm-helpers/openstack-origin into lp:charm-helpers

[Corey Bryant]

The openstack-origin wasn't properly getting set for all services. This fixes that.

[lp:~corey.bryant/charm-helpers/openstack-origin]

173. By Marco Ceppi on 2014-06-26

[tvansteenburgh] Adds basic API documentation for the package, along with make targets for building and publishing it (see HACKING for details).

174. By Stuart Bishop on 2014-06-27

[stub] Stop configure_sources() from breaking when configuration was not provided

175. By Juan L. Negron on 2014-06-27

Add a function get_ipv6_addr() to let service charm get an ipv6 address.
And could return a url containing ipv6 address if service charm have set the use-ipv6 config. MP:224793

176. By James Page on 2014-07-01

Revert last change to charm-helpers as it breaks unit tests

177. By James Page on 2014-07-01

[coreycb,r=james-page] Ensure openstack-origin is set consistently during testing.

=== modified file 'charmhelpers/contrib/amulet/utils.py'
--- charmhelpers/contrib/amulet/utils.py	2014-06-20 13:27:58 +0000
+++ charmhelpers/contrib/amulet/utils.py	2014-06-30 17:22:58 +0000
@@ -53,9 +53,10 @@
         """Verify the specified services are running on the corresponding
            service units."""
         for k, v in commands.iteritems():
-            output, code = k.run(v)
-            if code != 0:
-                return "command `{}` returned {}".format(v, str(code))
+            for cmd in v:
+                output, code = k.run(cmd)
+                if code != 0:
+                    return "command `{}` returned {}".format(cmd, str(code))
         return None
 
     def _get_config(self, unit, filename):
@@ -126,21 +127,24 @@
         """Get last modification time of directory."""
         return sentry_unit.directory_stat(directory)['mtime']
 
-    def _get_proc_start_time(self, sentry_unit, service):
+    def _get_proc_start_time(self, sentry_unit, service, pgrep_full=False):
         """Determine start time of the process based on the last modification
-           time of the /proc/pid directory.  The servie string will be matched
-           against any substring in the full command line, choosing the oldest
-           process."""
-        cmd = 'pgrep -f -o {}'.format(service)
+           time of the /proc/pid directory. If pgrep_full is True, the process
+           name is matched against the full command line."""
+        if pgrep_full:
+            cmd = 'pgrep -o -f {}'.format(service)
+        else:
+            cmd = 'pgrep -o {}'.format(service)
         proc_dir = '/proc/{}'.format(sentry_unit.run(cmd)[0].strip())
         return self._get_dir_mtime(sentry_unit, proc_dir)
 
-    def service_restarted(self, sentry_unit, service, filename):
+    def service_restarted(self, sentry_unit, service, filename,
+                          pgrep_full=False):
         """Compare a service's start time vs a file's last modification time
            (such as a config file for that service) to determine if the service
            has been restarted."""
         sleep(10)
-        if self._get_proc_start_time(sentry_unit, service) >= \
+        if self._get_proc_start_time(sentry_unit, service, pgrep_full) >= \
            self._get_file_mtime(sentry_unit, filename):
             return True
         else:
 
=== modified file 'charmhelpers/contrib/openstack/amulet/deployment.py'
--- charmhelpers/contrib/openstack/amulet/deployment.py	2014-06-20 13:27:21 +0000
+++ charmhelpers/contrib/openstack/amulet/deployment.py	2014-06-30 17:22:58 +0000
@@ -7,19 +7,36 @@
     """This class inherits from AmuletDeployment and has additional support
        that is specifically for use by OpenStack charms."""
 
-    def __init__(self, series=None, openstack=None):
+    def __init__(self, series=None, openstack=None, source=None):
         """Initialize the deployment environment."""
-        self.openstack = None
         super(OpenStackAmuletDeployment, self).__init__(series)
-
-        if openstack:
-            self.openstack = openstack
+        self.openstack = openstack
+        self.source = source
+
+    def _add_services(self, this_service, other_services):
+        """Add services to the deployment and set openstack-origin."""
+        super(OpenStackAmuletDeployment, self)._add_services(this_service,
+                                                             other_services)
+        name = 0
+        services = other_services
+        services.append(this_service)
+        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph']
+
+        if self.openstack:
+            for svc in services:
+                if svc[name] not in use_source:
+                    config = {'openstack-origin': self.openstack}
+                    self.d.configure(svc[name], config)
+
+        if self.source:
+            for svc in services:
+                if svc[name] in use_source:
+                    config = {'source': self.source}
+                    self.d.configure(svc[name], config)
 
     def _configure_services(self, configs):
         """Configure all of the services."""
         for service, config in configs.iteritems():
-            if service == self.this_service:
-                config['openstack-origin'] = self.openstack
             self.d.configure(service, config)
 
     def _get_openstack_release(self):
 
=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
--- charmhelpers/contrib/openstack/amulet/utils.py	2014-06-24 13:57:57 +0000
+++ charmhelpers/contrib/openstack/amulet/utils.py	2014-06-30 17:22:58 +0000
@@ -74,7 +74,7 @@
                     if ret:
                         return "unexpected tenant data - {}".format(ret)
             if not found:
-                return "tenant {} does not exist".format(e.name)
+                return "tenant {} does not exist".format(e['name'])
         return ret
 
     def validate_role_data(self, expected, actual):
@@ -91,7 +91,7 @@
                     if ret:
                         return "unexpected role data - {}".format(ret)
             if not found:
-                return "role {} does not exist".format(e.name)
+                return "role {} does not exist".format(e['name'])
         return ret
 
     def validate_user_data(self, expected, actual):
@@ -110,7 +110,7 @@
                     if ret:
                         return "unexpected user data - {}".format(ret)
             if not found:
-                return "user {} does not exist".format(e.name)
+                return "user {} does not exist".format(e['name'])
         return ret
 
     def validate_flavor_data(self, expected, actual):
@@ -192,8 +192,8 @@
 
         count = 1
         status = instance.status
-        while status == 'BUILD' and count < 10:
-            time.sleep(5)
+        while status != 'ACTIVE' and count < 60:
+            time.sleep(3)
             instance = nova.servers.get(instance.id)
             status = instance.status
             self.log.debug('instance status: {}'.format(status))