Merge lp:~gnuoy/openstack-mojo-specs/add-designate-ha-tests into lp:openstack-mojo-specs

[Liam Young]

[David Ames (thedac)]

A couple of stray debug prints.

But also we seem to be using the first version of the next_deploy_designate spec while changing the bundle from reactive-next.yaml to designate-next.yaml.

Do the original tests all pass?
Should we get rid of one or the other of the bundles?
 The original intent of reactive-next.yaml was to have a place for all of the new charms.
 Should this be the HA version of that?

review: Needs Fixing

[Liam Young (gnuoy)]

I'll remove the stray debug prints.

The reactive-next.yaml and new designate-next.yaml differ only in the way designate is deployed. In designate-next.yaml designate and designate-bind are deployed in an HA configuration so that the bind resilience tests can be run. I decided to extend the existing next_deploy_designate spec because it seemed pointless to have a designate non-ha and designate ha spec.

I think ultimately you are correct and designate-next.yaml is the beginnings of an HA version of reactive-next.yaml but I think a full HA version of reactive-next.yaml is beyond the scope of this change.

Finally, the original tests that are part of next_deploy_designate do pass. The nova sink tests currently fails due to a designate regression in master.

[lp:~gnuoy/openstack-mojo-specs/add-designate-ha-tests]

331. By Liam Young <email address hidden> on 2018-02-02

Tidy up

[David Ames (thedac)]

Merging.

review: Approve

=== added file 'helper/bundles/designate-next-ha.yaml'
--- helper/bundles/designate-next-ha.yaml	1970-01-01 00:00:00 +0000
+++ helper/bundles/designate-next-ha.yaml	2018-02-02 09:55:24 +0000
@@ -0,0 +1,406 @@
+# vim: set ts=2 et:
+# deployer bundle for development ('next') charms
+# UOSCI relies on this for OS-on-OS deployment testing
+base-services:
+  services:
+    rabbitmq-server:
+      charm: rabbitmq-server
+      constraints: mem=1G
+    ceph-mon:
+      charm: ceph-mon
+      num_units: 3
+      options:
+        expected-osd-count: 3
+    ceph-osd:
+      charm: ceph-osd
+      constraints: mem=1G
+      num_units: 3
+      options:
+        ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
+    ntp:
+      charm: ntp
+      num_units: 0
+    keystone:
+      charm: keystone
+      constraints: mem=1G
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+    openstack-dashboard:
+      charm: openstack-dashboard
+      constraints: mem=1G
+    nova-compute:
+      charm: nova-compute
+      num_units: 3
+      constraints: mem=4G
+      options:
+        enable-live-migration: True
+        enable-resize: True
+        migration-auth-type: ssh
+    nova-cloud-controller:
+      charm: nova-cloud-controller
+      constraints: mem=2G
+      options:
+        network-manager: Neutron
+    neutron-gateway:
+      charm: neutron-gateway
+      constraints: mem=4G
+      options:
+        instance-mtu: 1300
+        bridge-mappings: physnet1:br-ex
+    neutron-api:
+      charm: neutron-api
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+        flat-network-providers: physnet1
+        enable-ml2-dns: True
+        dns-domain: mojo.serverstack.
+        reverse-dns-lookup: True
+        ipv4-ptr-zone-prefix-size: 24
+    neutron-openvswitch:
+      charm: neutron-openvswitch
+    cinder:
+      charm: cinder
+      options:
+        block-device: "None"
+        glance-api-version: 2
+      constraints: mem=1G
+    cinder-ceph:
+      charm: cinder-ceph
+    glance:
+      charm: glance
+      constraints: mem=1G
+    swift-proxy:
+      charm: swift-proxy
+      constraints: mem=1G
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+    swift-storage-z1:
+      charm: swift-storage
+      constraints: mem=1G
+      options:
+        zone: 1
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z2:
+      charm: swift-storage
+      constraints: mem=1G
+      options:
+        zone: 2
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z3:
+      charm: swift-storage
+      constraints: mem=1G
+      options:
+        zone: 3
+        block-device: vdb
+        overwrite: "true"
+    ceilometer:
+      charm: ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      charm: ceilometer-agent
+    heat:
+      charm: heat
+    mongodb:
+      charm: mongodb
+      constraints: mem=1G
+  relations:
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
+    - [ nova-cloud-controller, rabbitmq-server ]
+    - [ nova-cloud-controller, glance ]
+    - [ nova-cloud-controller, keystone ]
+    - [ nova-compute, nova-cloud-controller ]
+    - - nova-compute
+      - rabbitmq-server:amqp
+    - [ nova-compute, glance ]
+    - [ nova-compute, ceph-mon ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ glance, ceph-mon ]
+    - [ glance, "cinder:image-service" ]
+    - [ glance, rabbitmq-server ]
+    - [ cinder, mysql ]
+    - [ cinder, rabbitmq-server ]
+    - [ cinder, nova-cloud-controller ]
+    - [ cinder, keystone ]
+    - [ cinder, cinder-ceph ]
+    - [ cinder-ceph, ceph-mon ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ openstack-dashboard, keystone ]
+    - [ swift-proxy, keystone ]
+    - [ swift-proxy, swift-storage-z1 ]
+    - [ swift-proxy, swift-storage-z2 ]
+    - [ swift-proxy, swift-storage-z3 ]
+    - - ceilometer
+      - keystone:identity-service
+    - [ ceilometer, rabbitmq-server ]
+    - [ ceilometer, mongodb ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ ceilometer-agent, ceilometer ]
+    - [ heat, mysql ]
+    - [ heat, keystone ]
+    - [ heat, rabbitmq-server ]
+    - [ "neutron-gateway:amqp", rabbitmq-server ]
+    - [ neutron-api, mysql ]
+    - [ neutron-api, rabbitmq-server ]
+    - [ neutron-api, nova-cloud-controller ]
+    - [ neutron-api, neutron-openvswitch ]
+    - [ neutron-api, keystone ]
+    - [ neutron-api, neutron-gateway ]
+    - [ neutron-openvswitch, nova-compute ]
+    - [ neutron-openvswitch, rabbitmq-server ]
+    - [ ceph-osd, ceph-mon ]
+    - [ ntp, ceph-osd ]
+openstack-services:
+  inherits: base-services
+  services:
+    mysql:
+      charm: mysql
+      constraints: mem=4G
+      options:
+        root-password: ChangeMe123
+        sst-password: ChangeMe123
+openstack-services-trusty-mitaka:
+  inherits: openstack-services
+  services:
+    aodh:
+      charm: aodh
+      constraints: mem=1G
+    designate:
+      charm: designate
+      num_units: 3
+      constraints: mem=1G
+      options:
+        nova-domain: 'mojo.serverstack.com.'
+        neutron-domain: 'mojo.serverstack.com.'
+        nova-domain-email: '[e-mail]'
+        neutron-domain-email: '[e-mail]'
+        nameservers: "ns1.mojo.serverstack.com."
+        vip: "{{ MOJO_OS_VIP10 }}"
+    designate-hacluster:
+      charm: hacluster
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+    designate-bind:
+      num_units: 3
+      charm: designate-bind
+    tempest:
+      charm: tempest
+      constraints: mem=1G
+  relations:
+    - [ aodh, rabbitmq-server ]
+    - [ aodh, mysql ]
+    - [ aodh, keystone ]
+    - [ designate, keystone ]
+    - [ designate, mysql ]
+    - [ designate, rabbitmq-server ]
+    - [ designate, designate-bind ]
+    - [ designate, memcached ]
+    - [ designate, neutron-api ]
+    - [ designate, designate-hacluster ]
+    # designate <-> nova-compute needed for legacy notifications
+    - [ designate, nova-compute ]
+    - [ keystone, tempest ]
+openstack-services-xenial:
+  inherits: openstack-services-trusty-mitaka
+  services:
+    barbican:
+      charm: barbican
+      constraints: mem=1G
+  relations:
+    - [ barbican, rabbitmq-server ]
+    - [ barbican, mysql ]
+    - [ barbican, keystone ]
+openstack-services-xenial-ocata:
+  inherits: openstack-services-xenial
+  services:
+    gnocchi:
+      charm: gnocchi
+    memcached:
+      charm: cs:memcached
+  relations:
+    - [ gnocchi, ceph-mon ]
+    - [ gnocchi, mysql ]
+    - [ gnocchi, rabbitmq-server ]
+    - [ gnocchi, memcached ]
+    - [ gnocchi, ceilometer ]
+    - [ gnocchi, keystone ]
+    - [ cinder-ceph, nova-compute ]
+# icehouse
+trusty-icehouse:
+  inherits: openstack-services
+  series: trusty
+trusty-icehouse-proposed:
+  inherits: trusty-icehouse
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+trusty-icehouse-trunk:
+  inherits: trusty-icehouse
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/icehouse
+    source: ppa:openstack-ubuntu-testing/icehouse
+    offline-compression: "no"
+# kilo
+trusty-kilo:
+  inherits: openstack-services
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
+trusty-kilo-proposed:
+  inherits: trusty-kilo
+  overrides:
+    openstack-origin: cloud:trusty-kilo/proposed
+    source: cloud:trusty-kilo/proposed
+trusty-kilo-staging:
+  inherits: trusty-kilo
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging
+    source: ppa:ubuntu-cloud-archive/kilo-staging
+# liberty
+trusty-liberty:
+  inherits: openstack-services
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+# mitaka
+trusty-mitaka:
+  #NOTE(coreycb): Temporarily disable reactive charms until
+  #               https://bugs.launchpad.net/bugs/1643027 is resolved.
+  #inherits: openstack-services-trusty-mitaka
+  inherits: openstack-services
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka
+    source: cloud:trusty-mitaka
+trusty-mitaka-proposed:
+  inherits: trusty-mitaka
+  overrides:
+    openstack-origin: cloud:trusty-mitaka/proposed
+    source: cloud:trusty-mitaka/proposed
+trusty-mitaka-staging:
+  inherits: trusty-mitaka
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
+    source: ppa:ubuntu-cloud-archive/mitaka-staging
+xenial-mitaka:
+  inherits: openstack-services-xenial
+  series: xenial
+xenial-mitaka-proposed:
+  inherits: xenial-mitaka
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+# newton
+xenial-newton:
+  inherits: openstack-services-xenial
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-newton
+    source: cloud:xenial-newton
+xenial-newton-proposed:
+  inherits: xenial-newton
+  overrides:
+    openstack-origin: cloud:xenial-newton/proposed
+    source: cloud:xenial-newton/proposed
+xenial-newton-staging:
+  inherits: xenial-newton
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
+    source: ppa:ubuntu-cloud-archive/newton-staging
+xenial-newton-branch:
+  inherits: xenial-newton
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/newton
+    source: ppa:openstack-ubuntu-testing/newton
+# ocata
+xenial-ocata:
+  inherits: openstack-services-xenial-ocata
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+xenial-ocata-proposed:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: cloud:xenial-ocata/proposed
+    source: cloud:xenial-ocata/proposed
+xenial-ocata-staging:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
+    source: ppa:ubuntu-cloud-archive/ocata-staging
+xenial-ocata-branch:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/ocata
+    source: ppa:openstack-ubuntu-testing/ocata
+zesty-ocata:
+  inherits: openstack-services-xenial-ocata
+  series: zesty
+zesty-ocata-proposed:
+  inherits: zesty-ocata
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+zesty-ocata-branch:
+  inherits: zesty-ocata
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/ocata
+    source: ppa:openstack-ubuntu-testing/ocata
+# pike
+xenial-pike:
+  inherits: openstack-services-xenial-ocata
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-pike
+    source: cloud:xenial-pike
+xenial-pike-proposed:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: cloud:xenial-pike/proposed
+    source: cloud:xenial-pike/proposed
+xenial-pike-staging:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/pike-staging
+    source: ppa:ubuntu-cloud-archive/pike-staging
+xenial-pike-branch:
+  inherits: xenial-pike
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/pike
+    source: ppa:openstack-ubuntu-testing/pike
+artful-pike:
+  inherits: openstack-services-xenial-ocata
+  series: artful
+artful-pike-proposed:
+  inherits: artful-pike
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+artful-pike-branch:
+  inherits: artful-pike
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/pike
+    source: ppa:openstack-ubuntu-testing/pike

=== modified file 'helper/collect/collect-next-reactive-xenial'
--- helper/collect/collect-next-reactive-xenial	2018-01-18 00:23:37 +0000
+++ helper/collect/collect-next-reactive-xenial	2018-02-02 09:55:24 +0000
@@ -7,6 +7,7 @@
 cinder-ceph            cs:~openstack-charmers-next/cinder-ceph
 cinder                 cs:~openstack-charmers-next/cinder
 glance                 cs:~openstack-charmers-next/glance
+hacluster              cs:~openstack-charmers-next/hacluster
 heat                   cs:~openstack-charmers-next/heat
 keystone               cs:~openstack-charmers-next/keystone
 mongodb                cs:~thedac/mongodb

=== modified file 'helper/setup/preflight.py'
--- helper/setup/preflight.py	2017-09-08 22:30:38 +0000
+++ helper/setup/preflight.py	2018-02-02 09:55:24 +0000
@@ -23,6 +23,7 @@
     'MOJO_OS_VIP07',
     'MOJO_OS_VIP08',
     'MOJO_OS_VIP09',
+    'MOJO_OS_VIP10',
 ]
 
 

=== added file 'helper/tests/expand_and_shrink_bind.py'
--- helper/tests/expand_and_shrink_bind.py	1970-01-01 00:00:00 +0000
+++ helper/tests/expand_and_shrink_bind.py	2018-02-02 09:55:24 +0000
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+import sys
+import utils.mojo_utils as mojo_utils
+import utils.mojo_os_utils as mojo_os_utils
+import argparse
+import time
+
+TEST_DOMAIN = 'mojo-ha-tests.com.'
+TEST_DOMAIN_EMAIL = '[e-mail]'
+TEST_WWW_RECORD = "www.{}".format(TEST_DOMAIN)
+TEST_RECORD = {TEST_WWW_RECORD: '10.0.0.23'}
+
+
+def main(argv):
+    mojo_utils.setup_logging()
+    # Setup client
+    overcloud_novarc = mojo_utils.get_overcloud_auth()
+    keystone_session = mojo_os_utils.get_keystone_session(overcloud_novarc,
+                                                          scope='PROJECT')
+    client = mojo_os_utils.get_designate_session_client(keystone_session)
+
+    # Create test domain and record in test domain
+    domain = mojo_os_utils.create_designate_dns_domain(
+        client,
+        TEST_DOMAIN,
+        TEST_DOMAIN_EMAIL)
+    record = mojo_os_utils.create_designate_dns_record(
+        client,
+        domain.id,
+        TEST_WWW_RECORD,
+        "A",
+        TEST_RECORD[TEST_WWW_RECORD])
+
+    # Test record is in bind and designate
+    mojo_os_utils.check_dns_entry(
+        client,
+        TEST_RECORD[TEST_WWW_RECORD],
+        TEST_DOMAIN,
+        record_name=TEST_WWW_RECORD)
+
+    mojo_utils.add_unit('designate-bind')
+
+    mojo_os_utils.check_dns_entry(
+        client,
+        TEST_RECORD[TEST_WWW_RECORD],
+        TEST_DOMAIN,
+        record_name=TEST_WWW_RECORD)
+
+    mojo_utils.delete_oldest('designate-bind')
+
+    mojo_os_utils.check_dns_entry(
+        client,
+        TEST_RECORD[TEST_WWW_RECORD],
+        TEST_DOMAIN,
+        record_name=TEST_WWW_RECORD)
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

=== modified file 'helper/utils/mojo_os_utils.py'
--- helper/utils/mojo_os_utils.py	2018-01-23 13:23:09 +0000
+++ helper/utils/mojo_os_utils.py	2018-02-02 09:55:24 +0000
@@ -20,6 +20,9 @@
 from neutronclient.v2_0 import client as neutronclient
 
 import designateclient.v1 as designateclient_v1
+import designateclient.v1.domains as des_domains
+import designateclient.v1.records as des_records
+import designateclient.exceptions as des_exceptions
 
 import logging
 import re
@@ -1060,6 +1063,66 @@
     return [r for r in designate_client.records.list(domain) if r.data == ip]
 
 
+def create_designate_dns_domain(designate_client, domain_name, email,
+                                recreate=True):
+    """Create the given domain in designate
+
+    @param designate_client: designateclient.v1.Client Client to query
+                                                       designate
+    @param domain_name: str Name of domain to lookup
+    @param email: str Email address to associate with domain
+    @param recreate: boolean Whether to delete any matching domains first.
+    """
+    if recreate:
+        delete_designate_dns_domain(designate_client, domain_name)
+        for i in range(1, 10):
+            try:
+                domain = des_domains.Domain(name=domain_name, email=email)
+                dom_obj = designate_client.domains.create(domain)
+            except des_exceptions.Conflict:
+                print("Waiting for delete {}/10".format(i))
+                time.sleep(10)
+            else:
+                break
+        else:
+            raise des_exceptions.Conflict
+    else:
+        domain = des_domains.Domain(name=domain_name, email=email)
+        dom_obj = designate_client.domains.create(domain)
+    return dom_obj
+
+
+def create_designate_dns_record(designate_client, domain_id, name, rtype,
+                                data):
+    """Create the given record in designmate
+
+    @param designate_client: designateclient.v1.Client Client to query
+                                                       designate
+    @param domain_id: str UUID of domain to create record in
+    @param name: str DNS fqdn entry to be created
+    @param rtype: str record type eg A, CNAME etc
+    @param data: str data to be associated with record
+    @returns designateclient.v1.records.Record
+    """
+    record = des_records.Record(name=name, type=rtype, data=data)
+    return designate_client.records.create(domain_id, record)
+
+
+def delete_designate_dns_domain(designate_client, domain_name):
+    """Delete the domains matching the given domain_name
+
+    @param designate_client: designateclient.v1.Client Client to query
+                                                       designate
+    @param domain_name: str Name of domain to lookup
+    @raises AssertionError: if domain deletion fails
+    """
+    dns_zone_id = get_designate_domain_objects(designate_client, domain_name)
+    old_doms = get_designate_domain_objects(designate_client, domain_name)
+    for old_dom in old_doms:
+        logging.info("Deleting old domain {}".format(old_dom.id))
+        designate_client.domains.delete(old_dom.id)
+
+
 def check_dns_record_exists(dns_server_ip, query_name, expected_ip,
                             retry_count=1):
     """Lookup a DNS record against the given dns server address
@@ -1077,7 +1140,7 @@
     for i in range(1, retry_count + 1):
         try:
             answers = my_resolver.query(query_name)
-        except dns.resolver.NXDOMAIN:
+        except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers):
             logging.info(
                 'Attempt {}/{} to lookup {}@{} failed. Sleeping before '
                 'retrying'.format(i, retry_count, query_name,
@@ -1095,6 +1158,22 @@
             assert str(rdata) == expected_ip
 
 
+def check_dns_entry(des_client, ip, domain, record_name, juju_status=None):
+    """Check that record for ip address is in designate and in bind if bind
+       server is available.
+
+    @param ip: str IP address to lookup
+    @param domain: str domain to look for record in
+    @param record_name: str record name
+    @param juju_status: dict Current juju status
+    """
+    if not juju_status:
+        juju_status = mojo_utils.get_juju_status()
+    check_dns_entry_in_designate(des_client, ip, domain,
+                                 record_name=record_name)
+    check_dns_entry_in_bind(ip, record_name, juju_status=juju_status)
+
+
 def check_dns_entry_in_designate(des_client, ip, domain, record_name=None):
     """Look for records in designate that match the given ip in the given
        domain

=== added symlink 'specs/full_stack/next_deploy_designate/mitaka/designate-next-ha.yaml'
=== target is u'../../../../helper/bundles/designate-next-ha.yaml'
=== added symlink 'specs/full_stack/next_deploy_designate/mitaka/expand_and_shrink_bind.py'
=== target is u'../../../../helper/tests/expand_and_shrink_bind.py'
=== modified file 'specs/full_stack/next_deploy_designate/mitaka/manifest'
--- specs/full_stack/next_deploy_designate/mitaka/manifest	2018-01-19 12:15:27 +0000
+++ specs/full_stack/next_deploy_designate/mitaka/manifest	2018-02-02 09:55:24 +0000
@@ -1,8 +1,11 @@
+# Validate env variables
+script config=preflight.py
+
 # Collect the charm branches from Launchpad
 collect config=collect-next-reactive-${MOJO_SERIES}
 
-# Use juju deployer with reactive-next.yaml bundle
-deploy config=reactive-next.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+# Use juju deployer with designate-next-ha.yaml bundle
+deploy config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -25,4 +28,7 @@
 # Test DNS records
 verify config=validate_designate.py
 
+# Expand and shrink bind service checking DNS records persist at each stage
+script config=expand_and_shrink_bind.py
+
 # Success

=== added symlink 'specs/full_stack/next_deploy_designate/mitaka/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== removed symlink 'specs/full_stack/next_deploy_designate/mitaka/reactive-next.yaml'
=== target was u'../../../../helper/bundles/reactive-next.yaml'
=== added symlink 'specs/full_stack/next_deploy_designate/newton/designate-next-ha.yaml'
=== target is u'../../../../helper/bundles/designate-next-ha.yaml'
=== added symlink 'specs/full_stack/next_deploy_designate/newton/expand_and_shrink_bind.py'
=== target is u'../../../../helper/tests/expand_and_shrink_bind.py'
=== modified file 'specs/full_stack/next_deploy_designate/newton/manifest'
--- specs/full_stack/next_deploy_designate/newton/manifest	2018-01-19 12:15:27 +0000
+++ specs/full_stack/next_deploy_designate/newton/manifest	2018-02-02 09:55:24 +0000
@@ -1,8 +1,11 @@
+# Validate env variables
+script config=preflight.py
+
 # Collect the charm branches from Launchpad
 collect config=collect-next-reactive-${MOJO_SERIES}
 
-# Use juju deployer with reactive-next.yaml bundle
-deploy config=reactive-next.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+# Use juju deployer with designate-next-ha.yaml bundle
+deploy config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -25,4 +28,7 @@
 # Test DNS records
 verify config=validate_designate.py
 
+# Expand and shrink bind service checking DNS records persist at each stage
+script config=expand_and_shrink_bind.py
+
 # Success

=== added symlink 'specs/full_stack/next_deploy_designate/newton/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== removed symlink 'specs/full_stack/next_deploy_designate/newton/reactive-next.yaml'
=== target was u'../../../../helper/bundles/reactive-next.yaml'
=== added symlink 'specs/full_stack/next_deploy_designate/ocata/designate-next-ha.yaml'
=== target is u'../../../../helper/bundles/designate-next-ha.yaml'
=== added symlink 'specs/full_stack/next_deploy_designate/ocata/expand_and_shrink_bind.py'
=== target is u'../../../../helper/tests/expand_and_shrink_bind.py'
=== modified file 'specs/full_stack/next_deploy_designate/ocata/manifest'
--- specs/full_stack/next_deploy_designate/ocata/manifest	2018-01-19 12:15:27 +0000
+++ specs/full_stack/next_deploy_designate/ocata/manifest	2018-02-02 09:55:24 +0000
@@ -1,8 +1,11 @@
+# Validate env variables
+script config=preflight.py
+
 # Collect the charm branches from Launchpad
 collect config=collect-next-reactive-${MOJO_SERIES}
 
 # Use juju deployer with reactive-next.yaml bundle
-deploy config=reactive-next.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -25,4 +28,7 @@
 # Test DNS records
 verify config=validate_designate.py
 
+# Expand and shrink bind service checking DNS records persist at each stage
+script config=expand_and_shrink_bind.py
+
 # Success

=== added symlink 'specs/full_stack/next_deploy_designate/ocata/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== removed symlink 'specs/full_stack/next_deploy_designate/ocata/reactive-next.yaml'
=== target was u'../../../../helper/bundles/reactive-next.yaml'
=== added symlink 'specs/full_stack/next_deploy_designate/pike/designate-next-ha.yaml'
=== target is u'../../../../helper/bundles/designate-next-ha.yaml'
=== added symlink 'specs/full_stack/next_deploy_designate/pike/expand_and_shrink_bind.py'
=== target is u'../../../../helper/tests/expand_and_shrink_bind.py'
=== modified file 'specs/full_stack/next_deploy_designate/pike/manifest'
--- specs/full_stack/next_deploy_designate/pike/manifest	2018-01-19 12:15:27 +0000
+++ specs/full_stack/next_deploy_designate/pike/manifest	2018-02-02 09:55:24 +0000
@@ -1,8 +1,11 @@
+# Validate env variables
+script config=preflight.py
+
 # Collect the charm branches from Launchpad
 collect config=collect-next-reactive-${MOJO_SERIES}
 
-# Use juju deployer with reactive-next.yaml bundle
-deploy config=reactive-next.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+# Use juju deployer with designate-next-ha.yaml bundle
+deploy config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -25,4 +28,7 @@
 # Test DNS records
 verify config=validate_designate.py
 
+# Expand and shrink bind service checking DNS records persist at each stage
+script config=expand_and_shrink_bind.py
+
 # Success

=== added symlink 'specs/full_stack/next_deploy_designate/pike/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== removed symlink 'specs/full_stack/next_deploy_designate/pike/reactive-next.yaml'
=== target was u'../../../../helper/bundles/reactive-next.yaml'