Merge "Rebuild for sync charm-helpers"

rebuild

@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-389bf05a-f851-43e4-b7a1-e2fdf00c2a80
+0d1ffbde-e2d6-11e8-aa1a-cb07dc37eb28

src/tests/basic_deployment.py

@@ -141,11 +141,21 @@ class DesignateBindDeployment(amulet_deployment.OpenStackAmuletDeployment):
         self.dns_slave_ip = self.designate_bind_sentry.relation(
             'dns-backend',
             'designate:dns-backend')['private-address']
-        self.designate_svcs = [
-            'designate-agent', 'designate-api', 'designate-central',
-            'designate-mdns', 'designate-pool-manager', 'designate-sink',
-            'designate-zone-manager',
-        ]
+
+        # bionic_rocky is the "first" rocky version, on Amulet list
+        # that is why start comparing with this version
+        if self._get_openstack_release() >= self.bionic_rocky:
+            self.designate_svcs = [
+                'designate-agent', 'designate-api', 'designate-central',
+                'designate-mdns', 'designate-worker', 'designate-sink',
+                'designate-producer',
+            ]
+        else:
+            self.designate_svcs = [
+                'designate-agent', 'designate-api', 'designate-central',
+                'designate-mdns', 'designate-pool-manager', 'designate-sink',
+                'designate-zone-manager',
+            ]
 
         # Authenticate admin with keystone
         self.keystone_session, self.keystone = u.get_default_keystone_session(

src/tox.ini

@@ -35,7 +35,7 @@ commands =
 # Run a specific test as an Amulet smoke test (expected to always pass)
 basepython = python2.7
 commands =
-    bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-queens --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-rocky --no-destroy
 
 [testenv:func27-dfs]
 # Run all deploy-from-source tests which are +x (may not always pass!)