Merge "Enable Ocata Amulet Tests"

metadata.yaml

@@ -14,6 +14,7 @@ tags:
   - misc
 series:
   - xenial
+  - zesty
   - trusty
   - yakkety
 extra-bindings:

tests/basic_deployment.py

@@ -327,11 +327,15 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
             self.keystone_sentry: ['keystone'],
             self.glance_sentry: ['glance-registry',
                                  'glance-api'],
-            self.cinder_sentry: ['cinder-api',
-                                 'cinder-scheduler',
+            self.cinder_sentry: ['cinder-scheduler',
                                  'cinder-volume'],
         }
 
+        if self._get_openstack_release() < self.xenial_mitaka:
+            services[self.cinder_sentry].append('cinder-api')
+        else:
+            services[self.cinder_sentry].append('apache2')
+
         if self._get_openstack_release() < self.xenial_mitaka:
             # For upstart systems only.  Ceph services under systemd
             # are checked by process name instead.
@@ -487,8 +491,14 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
         u.log.debug('Checking cinder (rbd) config file data...')
         unit = self.cinder_sentry
         conf = '/etc/cinder/cinder.conf'
+        # NOTE(jamespage): Deal with section config for >= ocata.
+        if self._get_openstack_release() >= self.xenial_ocata:
+            section_key = 'CEPH'
+        else:
+            section_key = 'DEFAULT'
+
         expected = {
-            'DEFAULT': {
+            section_key: {
                 'volume_driver': 'cinder.volume.drivers.rbd.RBDDriver'
             }
         }

tox.ini

@@ -14,13 +14,18 @@ install_command =
   pip install --allow-unverified python-apt {opts} {packages}
 commands = ostestr {posargs}
 whitelist_externals = juju
-passenv = HOME TERM AMULET_*
+passenv = HOME TERM AMULET_* CS_API_URL
 
 [testenv:py27]
 basepython = python2.7
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
+[testenv:py35]
+basepython = python3.5
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:pep8]
 basepython = python2.7
 deps = -r{toxinidir}/requirements.txt