Merge lp:~jjo/openstack-mojo-specs/mojo-openstack-specs-add-mojo-bootstack-specs into lp:openstack-mojo-specs

[JuanJo Ciarlante]

Unmerged revisions

219. By JuanJo Ciarlante on 2015-04-27

[jjo, r=] add bootstack to mojo-openstack-specs
* generalize mojo_utils.py and mojo_os_utils.py functions to support
  arbitrary net_name, subnet_name, etc
* network_setup.py: support skipping undercloud network setup if undercloud
  is not nova (eg MaaS)
* add helper/setup/allow_vips_addresses.py, similar to setup_vips.py but
  with a different approach to carve unused IPs, plus doing neutron
  allowed_address_pairs to VIP'd service units
* add helper/setup/bootstrap_ha.py
* add bootstack-charms-1504.bzr
* simple_os_checks.py: add --net_name arg, move it off mojo_os_utils.py
* add specs/bootstack/ha_phased and specs/bootstack/customer/configs
  - based on 'bootstack-example' configs branch
  - has secrets fully included, to avoid the need for /srv/mojo/LOCAL
    setup
  - note the extensive usage of YAML aliases (~varnames)
  - note the 'mysql' servicename (albeit using percona-cluster charm)
  - stages:
    - stage1: services that reside in metal
    - stage2: LXC'able and smooshed services, hacluster srv+relations
    - stage2-relations: inter-service relations
    - stage2-complete: num_units from 2 to 3, for VIP'd services

=== added file 'helper/setup/allow_vips_addresses.py'
--- helper/setup/allow_vips_addresses.py	1970-01-01 00:00:00 +0000
+++ helper/setup/allow_vips_addresses.py	2015-04-27 20:19:34 +0000
@@ -0,0 +1,75 @@
+#!/usr/bin/python
+import utils.mojo_utils as mojo_utils
+import utils.mojo_os_utils as mojo_os_utils
+import netaddr
+import logging
+
+
+class VipPool():
+    def __init__(self, neutronc):
+        prov_net = mojo_utils.get_undercload_netid()
+        if prov_net:
+            net = neutronc.list_networks(name=prov_net)['networks'][0]
+        else:
+            net = mojo_os_utils.get_admin_net(neutronc)
+        subnet_id = net['subnets'][0]
+        subnet = neutronc.list_subnets(id=subnet_id)['subnets'][0]
+        ports = neutronc.list_ports()
+        used_ips = [p.get('fixed_ips') for p in ports['ports']]
+        used_ips = [ip[0].get('ip_address') for ip in used_ips if ip]
+        self.port_by_device_id = {p['device_id']:p for p in ports['ports']}
+
+        self.cidr = subnet['cidr']
+        self.available_ips = []
+        # shamelessly scan the whole cidr, saving unused IPs (not in any port)
+        for ip in list(netaddr.IPNetwork(self.cidr))[1:-1]:
+            ip = str(ip)
+            if not ip in used_ips:
+                self.available_ips.append(ip)
+
+    def get_port_by_device_id(self, uuid):
+        return self.port_by_device_id.get(uuid)
+
+    def get_next(self):
+        try:
+            return self.available_ips.pop()
+        except IndexError:
+            raise Exception("vip pool exhausted")
+
+logging.basicConfig(level=logging.INFO)
+undercloud_novarc = mojo_utils.get_undercload_auth()
+neutronc = mojo_os_utils.get_neutron_client(undercloud_novarc)
+vp = VipPool(neutronc)
+juju_status = mojo_utils.get_juju_status()
+new_vip = None
+for svc in juju_status['services']:
+    # we don't use rabbitmq's vip but rather let it cluster and
+    # use all endpoints, skip
+    if svc.startswith("rabbitmq"):
+        continue
+    if not 'vip' in mojo_utils.juju_get_config_keys(svc):
+        continue
+    vip = mojo_utils.juju_get(svc, "vip")
+    if vip and vip in vp.available_ips:
+        logging.info("service=%s vip=%s Ok", svc, vip)
+    else:
+        new_vip = vp.get_next()
+        if vip:
+            logging.warning("service=%s vip=%s is in use, changing to new_vip=%s",
+                            svc, vip, new_vip)
+        else:
+            logging.info("service=%s has no vip, using new_vip=%s", svc, new_vip)
+        mojo_utils.juju_set(svc, '%s=%s' % ('vip', new_vip), wait=False)
+    # add allowed_address_pairs containing the vip to each unit
+    for u_name, u_data in juju_status["services"][svc]['units'].items():
+        machine = u_data['machine']
+        nova_id = juju_status['machines'][machine]['instance-id']
+        port = vp.get_port_by_device_id(nova_id)
+        logging.info("unit=%s nova_id=%s port_id=%s: allowing vip=%s",
+                     u_name, nova_id, port['id'], vip)
+        pairs = [{'ip_address': vip}]
+        neutronc.update_port(port['id'], {'port': {'allowed_address_pairs': pairs}})
+        
+# If there was any new_vip, wait
+if new_vip:
+    mojo_utils.juju_wait_finished()

=== added file 'helper/setup/bootstrap_ha.py'
--- helper/setup/bootstrap_ha.py	1970-01-01 00:00:00 +0000
+++ helper/setup/bootstrap_ha.py	2015-04-27 20:19:34 +0000
@@ -0,0 +1,74 @@
+#!/usr/bin/python
+import sys
+import utils.mojo_utils as mojo_utils
+import logging
+import argparse
+import time
+
+
+def bootstrap_ha(m0_constraints=None,
+                 m12_constraints=None,
+                 rest_constraints=None,
+                 ha_servicename=None):
+    if m0_constraints:
+        constraints = ("--constraints", m0_constraints)
+    else:
+        constraints = ()
+    mojo_utils.bootstrap(*constraints)
+
+    # hack to reset constraints for the rest of the env
+    # as there's no unset-constraints:
+    mojo_utils.set_constraints("tags=")
+
+    if m12_constraints:
+        constraints = ("--constraints", m12_constraints)
+    else:
+        constraints = ()
+    mojo_utils.ensure_availability(*constraints)
+
+    if rest_constraints:
+        mojo_utils.set_constraints(rest_constraints)
+
+    logging.info("Waiting for environment to settle")
+    mojo_utils.juju_status_check_and_wait()
+
+    # add a dummy service to HA units, to ease referring to them
+    # by this juju service name
+    if (ha_servicename):
+        # deploy ha_servicename dummy service to machine: [0, 1, 2]
+        units = mojo_utils.get_juju_units(None, ha_servicename)
+        if not "{}/0".format(ha_servicename) in units:
+            logging.info("deploying %s/0", ha_servicename)
+            mojo_utils.deploy("cs:trusty/ubuntu", ha_servicename, "--to", "0")
+        else:
+            logging.info("%s/0 unit already present", ha_servicename)
+        for num in (1, 2):
+            if not "{}/{}".format(ha_servicename, num) in units:
+                logging.info("adding %s/%d", ha_servicename, num)
+                mojo_utils.add_unit(ha_servicename, 1, "--to", str(num))
+		time.sleep(30)
+            else:
+                logging.info("%s/%d unit already present", ha_servicename, num)
+        mojo_utils.juju_status_check_and_wait()
+    return True
+
+
+def main(argv):
+    logging.basicConfig(level=logging.INFO)
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--m0_constraints")
+    parser.add_argument("--m12_constraints")
+    parser.add_argument("--rest_constraints")
+    parser.add_argument("--ha_servicename")
+    options = parser.parse_args()
+    m0_c = mojo_utils.parse_mojo_arg(options, 'm0_constraints')
+    m12_c = mojo_utils.parse_mojo_arg(options, 'm12_constraints')
+    rest_c = mojo_utils.parse_mojo_arg(options, 'rest_constraints')
+    ha_svc = mojo_utils.parse_mojo_arg(options, 'ha_servicename')
+    logging.info("Bootstrapping with: bootstrap_ha(%s, %s, %s, %s)",
+                 m0_c, m12_c, rest_c, ha_svc)
+    return 0 if bootstrap_ha(m0_c, m12_c, rest_c, ha_svc) else 1
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))

=== modified file 'helper/setup/images.yaml'
--- helper/setup/images.yaml	2014-12-16 15:41:15 +0000
+++ helper/setup/images.yaml	2015-04-27 20:19:34 +0000
@@ -7,7 +7,8 @@
   disk_format: qcow2
   glance_name: cirros
   is_public: 'true'
-  url: http://10.245.160.50:80/swift/v1/images/cirros-0.3.3-x86_64-disk.img
+#  url: http://10.245.160.50:80/swift/v1/images/cirros-0.3.3-x86_64-disk.img
+  url: http://cdn.download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
 precise:
   auth_type: privkey
   bootstring: cloud-init boot finished at

=== modified file 'helper/setup/network_setup.py'
--- helper/setup/network_setup.py	2015-02-10 07:55:00 +0000
+++ helper/setup/network_setup.py	2015-04-27 20:19:34 +0000
@@ -15,22 +15,29 @@
     # Resolve the tenant name from the overcloud novarc into a tenant id
     tenant_id = mojo_os_utils.get_tenant_id(keystonec,
                                             overcloud_novarc['OS_TENANT_NAME'])
+    private_subnet_name = net_info.get('private_subnet_name', 'private_subnet')
+    private_net_name = net_info.get('private_net_name', 'private')
+    router_name = net_info.get('router_name', 'provider-router')
+    ext_net_name = net_info.get('external_net_name', 'ext_net')
+    ext_subnet_name = net_info.get('external_subnet_name', 'ext_net_subnet')
     # Create the external network
     ext_network = mojo_os_utils.create_external_network(
         neutronc,
         tenant_id,
-        net_info['external_net_name'],
+        ext_net_name,
         net_info['network_type'])
     mojo_os_utils.create_external_subnet(
         neutronc,
         tenant_id,
         ext_network,
+        ext_subnet_name,
         net_info['default_gateway'],
         net_info['external_net_cidr'],
         net_info['start_floating_ip'],
-        net_info['end_floating_ip'],
-        net_info['external_subnet_name'])
-    provider_router = mojo_os_utils.create_provider_router(neutronc, tenant_id)
+        net_info['end_floating_ip'])
+    provider_router = mojo_os_utils.create_provider_router(neutronc,
+                                                           tenant_id,
+                                                           router_name)
     mojo_os_utils.plug_extnet_into_router(
         neutronc,
         provider_router,
@@ -38,20 +45,22 @@
     tenant_network = mojo_os_utils.create_tenant_network(
         neutronc,
         tenant_id,
+        private_net_name,
         shared=False,
         network_type=net_info['network_type'])
     tenant_subnet = mojo_os_utils.create_tenant_subnet(
         neutronc,
         tenant_id,
         tenant_network,
-        net_info['private_net_cidr'])
+        net_info['private_net_cidr'],
+        private_subnet_name)
     mojo_os_utils.update_subnet_dns(
         neutronc,
         tenant_subnet,
         net_info['external_dns'])
     mojo_os_utils.plug_subnet_into_router(
         neutronc,
-        net_info['router_name'],
+        router_name,
         tenant_network,
         tenant_subnet)
 
@@ -64,15 +73,19 @@
     net_topology = mojo_utils.parse_mojo_arg(options, 'net_topology')
     logging.info('Setting up %s network' % (net_topology))
     undercloud_novarc = mojo_utils.get_undercload_auth()
-    novac = mojo_os_utils.get_nova_client(undercloud_novarc)
-    neutronc = mojo_os_utils.get_neutron_client(undercloud_novarc)
-    # Add an interface to the neutron-gateway units and tell juju to us it
-    # as the external port
-    net_info = mojo_utils.get_mojo_config('network.yaml')[net_topology]
-    mojo_os_utils.configure_gateway_ext_port(
-        novac,
-        neutronc,
-        dvr_mode=net_info.get('dvr_enabled', False))
+    if undercloud_novarc:
+        novac = mojo_os_utils.get_nova_client(undercloud_novarc)
+        neutronc = mojo_os_utils.get_neutron_client(undercloud_novarc)
+        # Add an interface to the neutron-gateway units and tell juju to us it
+        # as the external port
+        net_info = mojo_utils.get_mojo_config('network.yaml')[net_topology]
+        mojo_os_utils.configure_gateway_ext_port(
+            novac,
+            neutronc,
+            dvr_mode=net_info.get('dvr_enabled', False))
+    else:
+        logging.info("Skipping undercloud network setup "
+                     "(no undercloud_novarc)")
     setup_sdn(net_topology)
 
 

=== modified file 'helper/tests/simple_os_checks.py'
--- helper/tests/simple_os_checks.py	2014-12-16 07:59:12 +0000
+++ helper/tests/simple_os_checks.py	2015-04-27 20:19:34 +0000
@@ -13,11 +13,13 @@
     parser.add_argument("--active_wait", default=180)
     parser.add_argument("--cloudinit_wait", default=180)
     parser.add_argument("--ping_wait", default=180)
+    parser.add_argument("--net_name", default='private')
     options = parser.parse_args()
     machines = mojo_utils.parse_mojo_arg(options, 'machines', multiargs=True)
     active_wait = int(mojo_utils.parse_mojo_arg(options, 'active_wait'))
     cloudinit_wait = int(mojo_utils.parse_mojo_arg(options, 'cloudinit_wait'))
     ping_wait = int(mojo_utils.parse_mojo_arg(options, 'ping_wait'))
+    net_name = mojo_utils.parse_mojo_arg(options, 'net_name')
     logging.basicConfig(level=logging.INFO)
     overcloud_novarc = mojo_utils.get_overcloud_auth()
     novac = mojo_os_utils.get_nova_client(overcloud_novarc)
@@ -30,6 +32,7 @@
                                     flavor_name=flavor_name,
                                     number=int(count),
                                     privkey=priv_key,
+                                    net_name=net_name,
                                     active_wait=active_wait,
                                     cloudinit_wait=cloudinit_wait,
                                     ping_wait=ping_wait)

=== modified file 'helper/tests/test_obj_store.py'
--- helper/tests/test_obj_store.py	2015-01-21 09:46:18 +0000
+++ helper/tests/test_obj_store.py	2015-04-27 20:19:34 +0000
@@ -6,6 +6,7 @@
 import utils.mojo_os_utils as mojo_os_utils
 import utils.mojo_utils as mojo_utils
 import sys
+import logging
 
 
 class ObjectPushPull(threading.Thread):
@@ -36,6 +37,10 @@
         return root_str*sizes[self.payload_size]
 
     def run(self):
+        logger = logging.getLogger(__name__)
+        logger.info("Starting %s: runs=%d, container=%s, payload_size=%s",
+                    self.thread_name, self.runs, self.container,
+                    self.payload_size)
         for i in range(0, self.runs):
             test_string = self.get_test_string()
             string_hash = self.get_hash(test_string)
@@ -45,6 +50,10 @@
                 self.successes += 1
             else:
                 self.failures += 1
+            if (i + 1) % (self.runs / 10) == 0:
+                logger.info("Thread %s: completed run %d/%d, succ=%d, fail=%d",
+                            self.thread_name, i + 1, self.runs,
+                            self.successes, self.failures)
 
     def get_swiftclient(self):
         overcloud_novarc = mojo_utils.get_overcloud_auth()
@@ -67,6 +76,9 @@
 
 
 def main(argv):
+    logger = logging.getLogger(__name__)
+    logger.addHandler(logging.StreamHandler())
+    logger.setLevel(logging.INFO)
     thread1 = ObjectPushPull(10, 'thread1', payload_size='l')
     thread2 = ObjectPushPull(100, 'thread2', payload_size='s')
     thread1.start()

=== modified file 'helper/utils/mojo_os_utils.py'
--- helper/utils/mojo_os_utils.py	2015-02-10 07:55:00 +0000
+++ helper/utils/mojo_os_utils.py	2015-04-27 20:19:34 +0000
@@ -197,19 +197,23 @@
     for net in neutron_client.list_networks()['networks']:
         if net['name'].endswith('_admin_net'):
             return net
+    logging.warning('No *_admin_net network found')
 
 
 def configure_gateway_ext_port(novaclient, neutronclient, dvr_mode=None):
     uuids = get_gateway_uuids()
     if dvr_mode:
         uuids.extend(get_ovs_uuids())
-    admin_net_id = get_admin_net(neutronclient)['id']
+    admin_net = get_admin_net(neutronclient) 
+    if not admin_net:
+        logging.error('No admin_net found, skipping exp_port setup')
+        return
     for uuid in uuids:
         server = novaclient.servers.get(uuid)
         mac_addrs = [a.mac_addr for a in server.interface_list()]
         if len(mac_addrs) < 2:
             logging.info('Adding additional port to server')
-            server.interface_attach(port_id=None, net_id=admin_net_id,
+            server.interface_attach(port_id=None, net_id=admin_net['id'],
                                     fixed_ip=None)
         else:
             logging.warning('Neutron Gateway already has additional port')
@@ -229,8 +233,8 @@
         mojo_utils.juju_wait_finished()
 
 
-def create_tenant_network(neutron_client, tenant_id, net_name='private',
-                          shared=False, network_type='gre'):
+def create_tenant_network(neutron_client, tenant_id, net_name, shared=False,
+                          network_type='gre'):
     networks = neutron_client.list_networks(name=net_name)
     if len(networks['networks']) == 0:
         logging.info('Creating network: %s',
@@ -252,8 +256,9 @@
     return network
 
 
-def create_external_network(neutron_client, tenant_id, net_name='ext_net',
+def create_external_network(neutron_client, tenant_id, net_name,
                             network_type='gre'):
+    logging.info('Configuring external net_name={}'.format(net_name))
     networks = neutron_client.list_networks(name=net_name)
     if len(networks['networks']) == 0:
         logging.info('Configuring external bridge')
@@ -277,8 +282,8 @@
     return network
 
 
-def create_tenant_subnet(neutron_client, tenant_id, network, cidr, dhcp=True,
-                         subnet_name='private_subnet'):
+def create_tenant_subnet(neutron_client, tenant_id, network, cidr, subnet_name,
+                         dhcp=True):
     # Create subnet
     subnets = neutron_client.list_subnets(name=subnet_name)
     if len(subnets['subnets']) == 0:
@@ -300,10 +305,9 @@
     return subnet
 
 
-def create_external_subnet(neutron_client, tenant_id, network,
+def create_external_subnet(neutron_client, tenant_id, network, subnet_name,
                            default_gateway=None, cidr=None,
-                           start_floating_ip=None, end_floating_ip=None,
-                           subnet_name='ext_net_subnet'):
+                           start_floating_ip=None, end_floating_ip=None):
     subnets = neutron_client.list_subnets(name=subnet_name)
     if len(subnets['subnets']) == 0:
         subnet_msg = {
@@ -345,20 +349,20 @@
     neutron_client.update_subnet(subnet['id'], msg)
 
 
-def create_provider_router(neutron_client, tenant_id):
-    routers = neutron_client.list_routers(name='provider-router')
+def create_provider_router(neutron_client, tenant_id, router_name):
+    routers = neutron_client.list_routers(name=router_name)
     if len(routers['routers']) == 0:
         logging.info('Creating provider router for external network access')
         router_info = {
             'router': {
-                'name': 'provider-router',
+                'name': router_name,
                 'tenant_id': tenant_id
             }
         }
         router = neutron_client.create_router(router_info)['router']
-        logging.info('New router created: %s', (router['id']))
+        logging.info('New router "%s" created: %s', router_name, router['id'])
     else:
-        logging.warning('Router provider-router already exists.')
+        logging.warning('Router %s already exists.', router_name)
         router = routers['routers'][0]
     return router
 
@@ -406,10 +410,10 @@
     return new_key.private_key
 
 
-def boot_instance(nova_client, image_name, flavor_name, key_name):
+def boot_instance(nova_client, image_name, flavor_name, key_name, net_name):
     image = nova_client.images.find(name=image_name)
     flavor = nova_client.flavors.find(name=flavor_name)
-    net = nova_client.networks.find(label="private")
+    net = nova_client.networks.find(label=net_name)
     nics = [{'net-id': net.id}]
     # Obviously time may not produce a unique name
     vm_name = time.strftime("%Y%m%d%H%M%S")
@@ -539,13 +543,15 @@
 
 
 def boot_and_test(nova_client, image_name, flavor_name, number, privkey,
-                  active_wait=180, cloudinit_wait=180, ping_wait=180):
+                  net_name, active_wait=180, cloudinit_wait=180,
+                  ping_wait=180):
     image_config = mojo_utils.get_mojo_config('images.yaml')
     for counter in range(number):
         instance = boot_instance(nova_client,
                                  image_name=image_name,
                                  flavor_name=flavor_name,
-                                 key_name='mojo')
+                                 key_name='mojo',
+                                 net_name=net_name)
         wait_for_boot(nova_client, instance.name,
                       image_config[image_name]['bootstring'], active_wait,
                       cloudinit_wait)

=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2015-02-10 07:55:00 +0000
+++ helper/utils/mojo_utils.py	2015-04-27 20:19:34 +0000
@@ -3,6 +3,7 @@
 import subprocess
 import yaml
 import os
+import re
 import mojo
 import logging
 import time
@@ -16,6 +17,60 @@
 }
 
 
+def bootstrap(*args):
+    if get_env(True):
+        return False
+    logging.info("Bootstrapping juju environment")
+    cmd = ['juju', 'bootstrap'] + list(args)
+    subprocess.check_call(cmd)
+    logging.info("Waiting for bootstrap to settle")
+    juju_status_check_and_wait()
+    return True
+
+
+def ensure_availability(*extra_args):
+    status = get_juju_status()
+    if status["machines"].keys() != ["0"]:
+        logging.warning("Unimplemented: environment should only have "
+                        "machine 0 to ensure_availability")
+        return False
+    cmd = ['juju', 'ensure-availability'] + list(extra_args)
+    logging.info("Calling: {}".format(cmd))
+    subprocess.check_call(cmd)
+    logging.info("Waiting for ensure-availability to settle")
+    juju_status_check_and_wait()
+    return True
+
+
+def set_constraints(constraints):
+    if type(constraints) == str:
+        constraints = [constraints]
+    else:
+        constraints = list(constraints)
+    cmd = ['juju', 'set-constraints'] + constraints
+    subprocess.check_call(cmd)
+
+
+def deploy(charm, service, *extra_args):
+    cmd = ['juju', 'deploy', charm, service] + list(extra_args)
+    subprocess.check_call(cmd)
+
+
+def get_env(softfail=False):
+    cmd = ['juju', 'get-env']
+    output = None
+    p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                         stderr=subprocess.STDOUT)
+    output, _ = p.communicate()
+    if p.returncode != 0:
+        if softfail and re.match('.*is not bootstrapped.*', output):
+            return {}
+        else:
+            raise Exception("juju get-env failed (rc={}) with:\n{}"
+                            "".format(p.returncode, output))
+    return output
+
+
 def get_juju_status(service=None, unit=None):
     cmd = ['juju', 'status']
     if service:
@@ -41,7 +96,7 @@
     else:
         services = [svc for svc in juju_status['services']]
     for svc in services:
-        if 'units' in juju_status['services'][svc]:
+        if 'units' in juju_status['services'].get(svc, {}):
             for unit in juju_status['services'][svc]['units']:
                 units.append(unit)
     return units
@@ -181,14 +236,16 @@
         units, lambda a, b: cmp(int(a.split('/')[-1]), int(b.split('/')[-1])))
 
 
-def add_unit(service, unit_num=None):
+def add_unit(service, unit_num=None, *extra_args):
+    extra_args = list(extra_args)
     unit_count = len(get_juju_units(service=service))
     if unit_num:
         additional_units = int(unit_num)
     else:
         additional_units = 1
     logging.info('Adding %i unit(s) to %s' % (additional_units, service))
-    cmd = ['juju', 'add-unit', service, '-n', str(additional_units)]
+    cmd = ['juju', 'add-unit', service, '-n',
+           str(additional_units)] + extra_args
     subprocess.check_call(cmd)
     target_num = unit_count + additional_units
     # Wait for the new unit to appear in juju status
@@ -217,25 +274,40 @@
     cmd = ['juju', 'get', service]
     juju_get_output = subprocess.Popen(cmd, stdout=subprocess.PIPE).stdout
     service_config = yaml.load(juju_get_output)
-    if 'value' in service_config['settings'][option]:
+    # softfail if option not present
+    if 'value' in service_config['settings'].get(option, {}):
         return service_config['settings'][option]['value']
 
 
-def get_juju_environments_yaml():
-    juju_env_file = open(os.environ['HOME'] + "/.juju/environments.yaml", 'r')
-    return yaml.load(juju_env_file)
+def get_juju_environment(juju_env):
+    juju_env_file_env = os.path.join(os.environ['HOME'],
+                                     ".juju/environments",
+                                     "{}.jenv".format(juju_env))
+    juju_env_file_all = os.path.join(os.environ['HOME'],
+                                     ".juju/environments.yaml")
+    if os.path.exists(juju_env_file_env):
+        return yaml.load(open(juju_env_file_env))["bootstrap-config"]
+    if os.path.exists(juju_env_file_all):
+        return yaml.load(open(juju_env_file_all))[juju_env]
+
+
+def get_juju_env():
+    return (os.environ.get("JUJU_ENV") or
+            subprocess.check_output(['juju', 'switch']).strip('\n'))
 
 
 def get_provider_type():
-    juju_env = subprocess.check_output(['juju', 'switch']).strip('\n')
-    juju_env_contents = get_juju_environments_yaml()
-    return juju_env_contents['environments'][juju_env]['type']
+    juju_env = get_juju_env()
+    juju_env_contents = get_juju_environment(juju_env)
+    return juju_env_contents['type']
 
 
 def get_undercload_auth():
-    juju_env = subprocess.check_output(['juju', 'switch']).strip('\n')
-    juju_env_contents = get_juju_environments_yaml()
-    novarc_settings = juju_env_contents['environments'][juju_env]
+    juju_env = get_juju_env()
+    novarc_settings = get_juju_environment(juju_env)
+    # e.g. over MaaS:
+    if not 'auth-url' in novarc_settings:
+        return None
     auth_settings = {
         'OS_AUTH_URL': novarc_settings['auth-url'],
         'OS_TENANT_NAME': novarc_settings['tenant-name'],
@@ -247,10 +319,9 @@
 
 
 def get_undercload_netid():
-    juju_env = subprocess.check_output(['juju', 'switch']).strip('\n')
-    juju_env_contents = get_juju_environments_yaml()
-    if 'network' in juju_env_contents['environments'][juju_env]:
-        return juju_env_contents['environments'][juju_env]['network']
+    juju_env = get_juju_env()
+    juju_env_contents = get_juju_environment(juju_env)
+    return juju_env_contents.get('network')
 
 
 # Openstack Client helpers
@@ -273,17 +344,20 @@
         transport = 'http'
         port = 5000
     address = get_auth_url()
+    os_password = juju_get('keystone', 'admin-password') or 'openstack'
+    os_region_name = juju_get('keystone', 'region') or 'RegionOne'
     auth_settings = {
         'OS_AUTH_URL': '%s://%s:%i/v2.0' % (transport, address, port),
         'OS_TENANT_NAME': 'admin',
         'OS_USERNAME': 'admin',
-        'OS_PASSWORD': 'openstack',
-        'OS_REGION_NAME': 'RegionOne',
+        'OS_PASSWORD': os_password,
+        'OS_REGION_NAME': os_region_name,
     }
     return auth_settings
 
 
 def get_mojo_file(filename):
+    mfile = None
     if 'MOJO_SPEC_DIR' in os.environ:
         spec = mojo.Spec(os.environ['MOJO_SPEC_DIR'])
         mfile = spec.get_config(filename, stage=os.environ['MOJO_STAGE'])

=== added directory 'specs/bootstack'
=== added directory 'specs/bootstack/customer'
=== added directory 'specs/bootstack/customer/configs'
=== added file 'specs/bootstack/customer/configs/bootstack-charms.bzr'
--- specs/bootstack/customer/configs/bootstack-charms.bzr	1970-01-01 00:00:00 +0000
+++ specs/bootstack/customer/configs/bootstack-charms.bzr	2015-04-27 20:19:34 +0000
@@ -0,0 +1,35 @@
+#openstack:
+ubuntu                     lp:charms/trusty/ubuntu;revno=10
+ubuntu-nagios              lp:charms/trusty/ubuntu;revno=10
+ntp                        lp:charms/trusty/ntp;revno=18
+hacluster                  lp:charms/trusty/hacluster;revno=41
+nova-compute               lp:charms/trusty/nova-compute;revno=100
+ceph                       lp:charms/trusty/ceph;revno=99
+ceph-osd                   lp:charms/trusty/ceph-osd;revno=38
+quantum-gateway            lp:charms/trusty/quantum-gateway;revno=86
+neutron-api                lp:charms/trusty/neutron-api;revno=74
+neutron-openvswitch        lp:charms/trusty/neutron-openvswitch;revno=42
+swift-proxy                lp:charms/trusty/swift-proxy;revno=81
+swift-storage              lp:charms/trusty/swift-storage;revno=57
+ceilometer                 lp:charms/trusty/ceilometer;revno=66
+ceilometer-agent           lp:charms/trusty/ceilometer-agent;revno=46
+heat                       lp:charms/trusty/heat;revno=33
+cinder                     lp:charms/trusty/cinder;revno=72
+glance                     lp:charms/trusty/glance;revno=97
+glance-simplestreams-sync  lp:charms/trusty/glance-simplestreams-sync;revno=52
+keystone                   lp:charms/trusty/keystone;revno=121
+nova-cloud-controller      lp:charms/trusty/nova-cloud-controller;revno=141
+openstack-dashboard        lp:charms/trusty/openstack-dashboard;revno=50
+mysql                      lp:charms/trusty/percona-cluster;revno=47
+rabbitmq-server            lp:charms/trusty/rabbitmq-server;revno=85
+mongodb                    lp:charms/trusty/mongodb;revno=67
+memcached                  lp:charms/trusty/memcached;revno=67
+
+## #landscape:
+## postgresql                 lp:charms/trusty/postgresql;revno=111
+## apache2                    lp:charms/trusty/apache2;revno=61
+## haproxy                    lp:charms/trusty/haproxy;revno=86
+## landscape                  lp:~landscape/landscape-charm/trunk;revno=218
+
+#ksplice:
+#trusty/ksplice                   lp:~canonical-sysadmins/canonical-is-charms/ksplice;revno=16

=== added file 'specs/bootstack/customer/configs/bootstack-example.yaml'
--- specs/bootstack/customer/configs/bootstack-example.yaml	1970-01-01 00:00:00 +0000
+++ specs/bootstack/customer/configs/bootstack-example.yaml	2015-04-27 20:19:34 +0000
@@ -0,0 +1,735 @@
+# vim: set sw=2 ts=2 et si:
+#
+# HACK: until LP#1324129 is fixed openstack-ha *needs* cmdline manual placement:
+#   juju deploy cs:ubuntu openstack-ha --to 0
+#   juju add-unit openstack-ha --to 1
+#   juju add-unit openstack-ha --to 2
+# This hack is performed by scripts/deploy-openstack.sh - there is no need for it to be done manually.
+#
+# NOTE: You also need to edit ../secrets/bootstack-example-secrets.yaml
+#
+# NOTE: to simplify mojo deployment tests/CI, we fully include bootstack-example-secrets.yaml
+#       content here (vs needing /srv/mojo/LOLOAL/$MOJO_PROJECT/$MOJO_STAGE/bootstack-example-secrets.yaml,
+#       except LDS and KSPLICE secrets
+
+###### mojo secrets BEGIN {
+# pwgen 16:
+config: &KEYSTONE_ADMIN_PASSWORD OgP2WZ2RITCLM3qG
+config: &KEYSTONE_ADMIN_TOKEN    iE8AtnALUvG729YD
+config: &MYSQL_ROOT_PASSWORD     IbXkv5PehNNBW1kO
+config: &MYSQL_SST_PASSWORD      GPtecPBWLlODg3S2
+
+# Below secret must be generated with:
+# ceph-authtool /dev/stdout --name=mon. --gen-key
+config: &CEPH_MON_SECRET         AQDymD5V4Di7JhAAh/SUQsmApvn4XAGHWs7rCQ==
+
+bootstack-stage1-secrets:
+  services:
+    mysql:
+      options:
+        root-password: *MYSQL_ROOT_PASSWORD
+        sst-password: *MYSQL_SST_PASSWORD
+
+bootstack-stage2-secrets:
+  services:
+    ceph:
+      options:
+        monitor-secret: *CEPH_MON_SECRET
+
+    keystone:
+      options:
+        admin-password: *KEYSTONE_ADMIN_PASSWORD
+        admin-token: *KEYSTONE_ADMIN_TOKEN
+###### mojo secrets END }
+
+
+# Quick check:
+#   python -c 'import yaml,sys,json;print yaml.dump(yaml.load(sys.stdin), default_flow_style=False)' < configs/bootstack-example.yaml
+config: &REGION         bootstack-example
+config: &NAGIOS_CONTEXT bootstack-example
+
+# uuidgen:
+config: &CEPH_FSID               7f3e5d9e-b6da-41d9-bfda-7aa4ddf32a52
+config: &SWIFT_HASH              b4e8c139-8404-44e3-bb8e-0e95878f9d96
+
+# depending on hardware layout:
+# NOTE on placement:
+# _CONST and _TO are exclusive: either TO (same host as existing service), xor new TAGged host (from MaaS)
+# and must be edited on the service stanza itself (constraints: or to:)
+
+# Usual disk arrangement: /dev/sda holds OS, /dev/sdb holds /srv/nova/instances
+# /srv/nova/instances must be created and mounted prior to deployment - see maas-preseeds.tmpl for details.
+config: &NOVA_COMPUTE_UNITS  4
+config: &NOVA_INSTANCES_PATH /srv/nova/instances
+#config: &NOVA_TO             [ ceph=0, ceph=1, ceph=2, ceph-osd=0 ]
+config: &NOVA_CONST          tags=compute
+
+config: &SWIFT_ZN_UNITS      1
+config: &SWIFT_Z1_TO         [ nova-compute=0 ]
+config: &SWIFT_Z2_TO         [ nova-compute=1 ]
+config: &SWIFT_Z3_TO         [ nova-compute=2 ]
+config: &SWIFT_BLOCK_DEVICE  /dev/sdd
+# &SWIFT_BLOCK_DEVICE may be a string containing multiple space-separated device names.
+
+config: &CEPH_MON_UNITS      3
+#config: &CEPH_MON_CONST      tags=storage
+#config: &CEPH_MON_TO         [ nova-compute=0, nova-compute=1, nova-compute=2 ]
+config: &CEPH_MON_TO         [ openstack-ha=0, openstack-ha=1, openstack-ha=2 ]
+config: &CEPH_PUBLIC_NET     172.20.168.0/21
+config: &CEPH_CLUSTER_NET    172.20.168.0/21
+
+config: &CEPH_OSD_UNITS      4
+# _CONST and _TO are exclusive: either TO same host as existing service, or new TAGged host
+#config: &CEPH_OSD_CONST      tags=storage
+# config: &CEPH_OSD_TO         [ nova-compute=3 ]
+config: &CEPH_OSD_TO         [ nova-compute=0, nova-compute=1, nova-compute=2, nova-compute=3 ]
+
+config: &CEPH_OSD_DEVICES    /dev/sdc
+# &CEPH_OSD_DEVICES may be a string containing multiple space-separated device names.
+
+# manually set, depends on openstack-ha hosts network interfaces - see maas-interfaces.tmpl for details
+config: &NEUTRON_GW_EXT_IFACE veth-os-ovs
+config: &NEUTRON_GW_INT_IFACE br0
+
+# manually set, depends on priv VLAN CIDR:
+config: &SWIFT_VIP      '172.20.168.100'
+config: &CINDER_VIP     '172.20.168.101'
+config: &GLANCE_VIP     '172.20.168.102'
+config: &KEYSTONE_VIP   '172.20.168.103'
+config: &MYSQL_VIP      '172.20.168.104'
+config: &NCC_VIP        '172.20.168.105'
+config: &DASH_VIP       '172.20.168.106'
+config: &NAPI_VIP       '172.20.168.107'
+config: &CEILOMETER_VIP '172.20.168.108'
+
+bootstack-stage1:
+  inherits: bootstack-stage1-secrets
+  series: trusty
+  # set below values to every charm where these settings exist  
+  overrides:
+    nagios_context: *NAGIOS_CONTEXT
+    corosync_transport: unicast
+  services:
+    # Already manually deployed as per above, added here to satisfy 'existence' to juju-deployer
+    # Openstack and Juju HA boxes
+    openstack-ha:
+      #charm: cs:trusty/ubuntu
+      charm: ubuntu
+      num_units: 3
+      # HACK: When LP#1324129 is fixed, we can uncomment below placement
+      # to: [0, 1, 2]
+      options:
+        new-lxc-network: True
+
+    ## Infra box: deploy to metal, in advance (services deployed at stage3 to lxc:infra)
+    ## Infra services are not used in internal deploys
+    infra:
+      constraints: tags=infra
+      #charm: cs:trusty/ubuntu
+      charm: ubuntu
+      num_units: 1
+
+    ## Compute nodes - hulk smashed onto swift and ceph nodes
+    nova-compute:
+      #charm: cs:trusty/nova-compute
+      #branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      charm: nova-compute
+      num_units: *NOVA_COMPUTE_UNITS
+      constraints: *NOVA_CONST
+      #to: *NOVA_TO
+      options:
+        enable-resize: True
+        enable-live-migration: True
+        migration-auth-type: ssh
+        instances-path: *NOVA_INSTANCES_PATH
+        # XXX: race: this fails if virsh iptables stuff hasn't been setup yet (no conntrack modules loaded)
+        # sysctl: "{ 'net.nf_conntrack_max': 589824, 'net.netfilter.nf_conntrack_tcp_timeout_established': 86400 }"
+
+    ## Neutron Gateway (hulk smashed onto opensatck-ha hosts)
+# TODO(jjo): complete neutron-gw HA RT#78447
+#    neutron-gw-hacluster:
+#       charm: hacluster
+    neutron-gateway:
+      #charm: cs:trusty/quantum-gateway
+      #branch: lp:~openstack-charmers/charms/trusty/quantum-gateway/next
+      charm: quantum-gateway
+      # HACK: When LP#1324129 is fixed, we can uncomment below placement
+      # to: [0, 1, 2]
+      to: [ openstack-ha=0, openstack-ha=1, openstack-ha=2 ]
+      num_units: 3
+      options:
+        ext-port: *NEUTRON_GW_EXT_IFACE
+#        ha-legacy-mode: True
+#        ha-bindiface: *NEUTRON_GW_INT_IFACE
+
+    mysql-hacluster:
+       #charm: cs:trusty/hacluster
+       charm: hacluster
+    mysql:
+       #charm: cs:trusty/mysql
+       #branch: lp:~openstack-charmers/charms/trusty/mysql/trunk
+       charm: mysql
+       num_units: 1
+       to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+       options:
+         dataset-size: 4G
+         vip: *MYSQL_VIP
+         #vip_cidr: 21
+         max-connections: 2500
+
+    ## Subordinates
+    ntp:
+      #charm: cs:~charmers/trusty/ntp
+      charm: ntp
+      options:
+        source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
+
+    ntp-physical:
+      #charm: cs:~charmers/trusty/ntp
+      charm: ntp
+      options:
+        source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
+
+    ntp-smoosh:
+      #charm: cs:~charmers/trusty/ntp
+      charm: ntp
+      options:
+        source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
+
+bootstack-stage2:
+  inherits: [bootstack-stage1, bootstack-stage2-secrets]
+  services:
+    ## Ceph
+    ceph:
+      #charm: cs:trusty/ceph
+      #branch: lp:~openstack-charmers/charms/trusty/ceph/next
+      charm: ceph
+      num_units: *CEPH_MON_UNITS
+      #constraints: *CEPH_MON_CONST
+      to: *CEPH_MON_TO
+      options:
+        monitor-count: *CEPH_MON_UNITS
+        fsid: *CEPH_FSID
+        osd-reformat: kill-all-my-data
+        #osd-devices: *CEPH_OSD_DEVICES
+        ceph-public-network: *CEPH_PUBLIC_NET
+        ceph-cluster-network: *CEPH_CLUSTER_NET
+    ceph-osd:
+      #charm: cs:trusty/ceph-osd
+      #branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next
+      charm: ceph-osd
+      num_units: *CEPH_OSD_UNITS
+      #constraints: *CEPH_OSD_CONST
+      to: *CEPH_OSD_TO
+      options:
+        osd-reformat: kill-all-my-data
+        osd-devices: *CEPH_OSD_DEVICES
+        ceph-public-network: *CEPH_PUBLIC_NET
+        ceph-cluster-network: *CEPH_CLUSTER_NET
+
+    swift-storage-z1:
+      #charm: cs:trusty/swift-storage
+      #branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
+      charm: swift-storage
+      num_units: *SWIFT_ZN_UNITS
+      #constraints: tags=swift-z1
+      options:
+        zone: 1
+        block-device: *SWIFT_BLOCK_DEVICE
+        overwrite: "true"
+      to: *SWIFT_Z1_TO
+    swift-storage-z2:
+      #charm: cs:trusty/swift-storage
+      #branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
+      charm: swift-storage
+      num_units: *SWIFT_ZN_UNITS
+      #constraints: tags=swift-z2
+      options:
+        zone: 2
+        block-device: *SWIFT_BLOCK_DEVICE
+        overwrite: "true"
+      to: *SWIFT_Z2_TO
+    swift-storage-z3:
+      #charm: cs:trusty/swift-storage
+      #branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
+      charm: swift-storage
+      num_units: *SWIFT_ZN_UNITS
+      #constraints: tags=swift-z3
+      options:
+        zone: 3
+        block-device: *SWIFT_BLOCK_DEVICE
+        overwrite: "true"
+      to: *SWIFT_Z3_TO
+
+    # Everything else is in containers
+    ## Stateless services ##
+    swift-hacluster:
+      #charm: cs:trusty/hacluster
+      charm: hacluster
+      options:
+        cluster_count: 3
+    swift-proxy:
+      num_units: 3
+      to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+      #charm: cs:trusty/swift-proxy
+      #branch: lp:~openstack-charmers/charms/trusty/swift-proxy/next
+      charm: swift-proxy
+      options:
+        replicas: 3
+        #use-https: "no"
+        zone-assignment: manual
+        region: *REGION
+        partition-power: 18
+        workers: 2
+        swift-hash: *SWIFT_HASH
+        vip: *SWIFT_VIP
+        #vip_cidr: 21
+    ceilometer-hacluster:
+      charm: hacluster
+      options:
+        cluster_count: 3
+    ceilometer:
+      #charm: cs:trusty/ceilometer
+      #branch: lp:~openstack-charmers/charms/trusty/ceilometer/next
+      charm: ceilometer
+      num_units: 3
+      to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+      options:
+        region: *REGION
+        vip: *CEILOMETER_VIP
+    ceilometer-agent:
+      #charm: cs:trusty/ceilometer-agent
+      #branch: lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
+      charm: ceilometer-agent
+
+    heat:
+      #charm: cs:trusty/heat
+      #branch: lp:~openstack-charmers/charms/trusty/heat/next
+      charm: heat
+      to: [ "lxc:openstack-ha=0" ]
+      options:
+        region: *REGION
+
+    cinder-hacluster: 
+      #charm: cs:trusty/hacluster
+      charm: hacluster
+      options:
+        cluster_count: 3
+    cinder:
+      #charm: cs:trusty/cinder
+      #branch: lp:~openstack-charmers/charms/trusty/cinder/next
+      charm: cinder
+      num_units: 3
+      to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+      options:
+        block-device: "None"
+        region: *REGION
+        glance-api-version: 2
+        ceph-osd-replication-count: 3
+        vip: *CINDER_VIP
+        #vip_cidr: 21
+
+    glance-hacluster:
+      #charm: cs:trusty/hacluster
+      charm: hacluster
+      options:
+        cluster_count: 3
+    glance:
+      charm: glance
+      num_units: 3
+      to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+      options:
+        region: *REGION
+        vip: *GLANCE_VIP
+        #vip_cidr: 21
+
+    # TODO: HA
+    glance-simplestreams-sync:
+      #charm: cs:trusty/glance-simplestreams-sync
+      charm: glance-simplestreams-sync
+      to: [ "lxc:openstack-ha=0" ]
+      options:
+        cloud_name: *REGION
+        region: *REGION
+        mirror_list: include-file://{{ spec_dir }}/specs/bootstack/customer/configs/glance-streams.yaml
+
+    keystone-hacluster:
+      #charm: cs:trusty/hacluster
+      charm: hacluster
+      options:
+        cluster_count: 3
+    keystone:
+      #charm: cs:trusty/keystone
+      #branch: lp:~openstack-charmers/charms/trusty/keystone/next
+      charm: keystone
+      num_units: 3
+      to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+      options:
+        region: *REGION
+        vip: *KEYSTONE_VIP
+        #vip_cidr: 21
+
+    ncc-hacluster:
+      #charm: cs:trusty/hacluster
+      charm: hacluster
+      options:
+        cluster_count: 3
+    ncc-memcached:
+      charm: memcached
+      num_units: 3
+      to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+      options:
+        size: 128
+        allow-ufw-ip6-softfail: true
+    nova-cloud-controller:
+      #charm: cs:trusty/nova-cloud-controller
+      #branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+      charm: nova-cloud-controller
+      num_units: 3
+      to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+      options:
+        # config-flags will likely be overloaded by additional settings like
+        # quota_RESOURCENAME=nnn,scheduler_default_filters=...
+        config-flags: disk_allocation_ratio=1.0
+        cpu-allocation-ratio: 4.0
+        ram-allocation-ratio: 0.9
+        network-manager: Neutron
+        console-access-protocol: novnc
+        quantum-security-groups: "yes"
+        region: *REGION
+        vip: *NCC_VIP
+        #vip_cidr: 21
+
+    osd-hacluster:
+      #charm: cs:trusty/hacluster
+      charm: hacluster
+      options:
+        cluster_count: 3
+    openstack-dashboard:
+      #charm: cs:trusty/openstack-dashboard
+      #branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+      #branch: lp:~brad-marshall/charms/trusty/openstack-dashboard/fix-hacluster-config
+      charm: openstack-dashboard
+      num_units: 3
+      to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+      options:
+        vip: *DASH_VIP
+        #vip_cidr: 21
+
+    neutron-hacluster:
+       charm: hacluster
+       options:
+         cluster_count: 3
+    neutron-api:
+       charm: neutron-api
+       num_units: 3
+       to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+       options:
+          vip: *NAPI_VIP
+          neutron-security-groups: True
+          region: *REGION
+    neutron-openvswitch:
+       charm: neutron-openvswitch
+
+    # HACK: 2 rabbitmq-server units here, 3rd added later
+    # NOTE rabbitmq-server does its own clustering, no VIP needed
+    rabbitmq-server:
+      #charm: cs:trusty/rabbitmq-server
+      #branch: lp:~jjo/charms/trusty/rabbitmq-server/fix-nodename-to-host-dns-PTR
+      # Combined branch: gnuoy's fix for rabbitmq-server creds across relations, and
+      # clustering with an invalid hostname
+      #branch: lp:~jjo/charms/trusty/rabbitmq-server/gnuoy-lp1355848_jjo-lp1274947
+      charm: rabbitmq-server
+      num_units: 2
+      to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+
+    # HACK: 1 mongodb unit here, others added later, as per mongodb README
+    # NOTE mongodb does its own clustering, no VIP needed
+    mongodb:
+      num_units: 1
+      to: [ "lxc:openstack-ha=0", "lxc:openstack-ha=1", "lxc:openstack-ha=2" ]
+      #charm: cs:trusty/aongodb
+      #branch: lp:~jjo/charms/trusty/mongodb/jjo-lp1274947-use_private-address_at_rs-initiate
+      charm: mongodb
+
+    mysql:
+       num_units: 2
+
+  # Keeping hacluster relations here, as they are intra-service, and 
+  # needed to have service VIPs alive
+  relations:
+    - [ mysql, mysql-hacluster ]
+    - [ keystone, keystone-hacluster ]
+    - [ nova-cloud-controller, ncc-hacluster ]
+    - [ glance, glance-hacluster ]
+    - [ cinder, cinder-hacluster ]
+    - [ openstack-dashboard, osd-hacluster ]
+    - [ swift-proxy, swift-hacluster ]
+    - [ neutron-api, neutron-hacluster ]
+    - [ ceilometer, ceilometer-hacluster ]
+#    - [ neutron-gateway, neutron-gw-hacluster ]
+
+bootstack-stage2-relations:
+  inherits: bootstack-stage2
+  relations:
+    - [ ceph, ceph-osd ]
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
+    - [ nova-cloud-controller, rabbitmq-server ]
+    - [ nova-cloud-controller, glance ]
+    - [ neutron-api, mysql ]
+    - [ neutron-api, rabbitmq-server ]
+    - [ neutron-api, nova-cloud-controller ]
+    - [ neutron-api, neutron-openvswitch ]
+    - [ nova-compute, nova-cloud-controller ]
+    - [ nova-compute, mysql ]
+    - [ nova-compute, "rabbitmq-server:amqp" ]
+    - [ nova-compute, glance ]
+    - [ nova-compute, ceph ]
+    - [ neutron-openvswitch, nova-compute ]
+    - [ neutron-openvswitch, rabbitmq-server ]
+    - [ glance, mysql ]
+    - [ glance, ceph ]
+    - [ glance, cinder ]
+    - [ cinder, mysql ]
+    - [ cinder, rabbitmq-server ]
+    - [ cinder, nova-cloud-controller ]
+    - [ cinder, ceph ]
+    - [ neutron-gateway, mysql ]
+    - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ ntp-smoosh, nova-compute ]
+    - [ ntp-physical, neutron-gateway ]
+    - [ ntp-physical, infra ]
+    - [ swift-proxy, swift-storage-z1 ]
+    - [ swift-proxy, swift-storage-z2 ]
+    - [ swift-proxy, swift-storage-z3 ]
+    - [ swift-proxy, swift-storage-z3 ]
+    - [ ceilometer,  rabbitmq-server ]
+    - [ ceilometer,  mongodb ]
+    - [ ceilometer-agent,  ceilometer ]
+    - [ ceilometer-agent, nova-compute ]
+    - [ heat, rabbitmq-server ]
+    - [ swift-proxy, keystone ]
+    - [ nova-cloud-controller, keystone ]
+    - [ neutron-api, keystone ]
+    - [ cinder, keystone ]
+    - [ glance, keystone ]
+    - [ openstack-dashboard, keystone ]
+    - [ ceilometer, "keystone:identity-service" ]
+    - [ ceilometer, "keystone:identity-notifications" ]
+    - [ heat, keystone ]
+    - [ heat, mysql ]
+    - [ glance-simplestreams-sync, keystone ]
+    - [ nova-cloud-controller, ncc-memcached ]
+
+bootstack-stage2-complete:
+  inherits: bootstack-stage2-relations
+  services:
+    # HACK: add the 3rd units to all
+    rabbitmq-server:
+      num_units: 3
+    mysql:
+      num_units: 3
+    mongodb:
+      num_units: 3
+
+infra:
+  inherits: [bootstack-stage2-complete, infra-secrets]
+  services:
+    ubuntu-nagios:
+      series: trusty
+      #charm: cs:trusty/ubuntu
+      #charm: ubuntu
+      to: lxc:infra
+    landscape-postgresql:
+      series: trusty
+      #charm: cs:trusty/postgresql
+      charm: postgresql
+      to: lxc:infra
+      options:
+        extra-packages: python-apt postgresql-contrib postgresql-.*-debversion
+        max_connections: 500
+    landscape-haproxy:
+      series: trusty
+      #charm: cs:precise/haproxy
+      charm: haproxy
+      to: lxc:infra
+      options:
+        enable_monitoring: True
+        monitoring_allowed_cidr: "0.0.0.0/0"
+        default_timeouts: "queue 60000, connect 5000, client 120000, server 120000"
+        # Don't deploy default haproxy service on port 80
+        services: ""
+
+    landscape-apache:
+      series: trusty
+      #charm: cs:trusty/apache2
+      charm: apache2
+      to: lxc:infra
+      expose: True
+      options:
+        enable_modules: proxy proxy_http proxy_balancer rewrite expires headers ssl
+        ssl_cert: SELFSIGNED
+        ssl_certlocation: apache2.cert
+        ssl_keylocation: apache2.key
+        nagios_check_http_params: '-H localhost -I 127.0.0.1 -u "/" -e 200,301,302'
+
+    landscape:
+      series: trusty
+      charm: landscape
+      to: lxc:infra
+      #branch: lp:~landscape/landscape-charm/stable
+      #branch: lp:~landscape/landscape-charm/trunk
+      options:
+        service-count: "2"
+        services: static appserver pingserver combo-loader async-frontend apiserver package-upload jobhandler package-search cron juju-sync
+        repository: http://ppa.launchpad.net/landscape/14.10/ubuntu
+        license-file: include-file://../secrets/landscape-license-file
+        admin-name: Bootstack Admin
+
+    landscape-msg:
+      series: trusty
+      to: lxc:infra
+      #branch: lp:~landscape/landscape-charm/stable
+      #branch: lp:~landscape/landscape-charm/trunk
+      charm: landscape
+      options:
+        services: msgserver
+        repository: http://ppa.launchpad.net/landscape/14.10/ubuntu
+        license-file: include-file://../secrets/landscape-license-file
+  relations:
+    - [landscape, rabbitmq-server]
+    - [landscape, landscape-haproxy]
+    #- [ntp, landscape]
+    - ["landscape:vhost-config", "landscape-apache:vhost-config"]
+    - ["landscape:db-admin", "landscape-postgresql:db-admin"]
+    - ["landscape-haproxy:website", "landscape-apache:reverseproxy"]
+    - [landscape-msg, rabbitmq-server]
+    - [landscape-msg, landscape-haproxy]
+    - ["landscape-msg:db-admin", "landscape-postgresql:db-admin"]
+
+ksplice:
+  inherits: [bootstack-stage2-complete, ksplice-secrets]
+  services:
+    ksplice:
+      charm: ksplice
+  relations:
+    - [ksplice, "openstack-ha:juju-info"]
+    - [ksplice, "infra:juju-info"]
+    - [ksplice, "nova-compute:juju-info"]
+
+# Below target includes all services + infra (ie final full stage)
+services-and-infra:
+    inherits: [bootstack-stage2-complete, nrpe, landscape-client, ksplice]
+
+# BoBstack
+config: &BOB_SWIFT_VIP      '172.20.1.100'
+config: &BOB_CINDER_VIP     '172.20.1.101'
+config: &BOB_GLANCE_VIP     '172.20.1.102'
+config: &BOB_KEYSTONE_VIP   '172.20.1.103'
+config: &BOB_MYSQL_VIP      '172.20.1.104'
+config: &BOB_NCC_VIP        '172.20.1.105'
+config: &BOB_DASH_VIP       '172.20.1.106'
+config: &BOB_NAPI_VIP       '172.20.1.107'
+config: &BOB_CEILOMETER_VIP '172.20.1.108'
+config: &BOB_CEPH_NET       '172.20.0.0/23'
+bootstack-stage1-overcloud:
+  inherits: [bootstack-stage1]
+  services:
+    neutron-gateway:
+      options:
+        ext-port: ''
+    infra:
+      constraints: ''
+    nova-compute:
+      constraints: ''
+      options:
+        instances-path: /var/lib/nova/instances
+        migration-auth-type: null
+    mysql:
+      to: null
+      options:
+        vip: *BOB_MYSQL_VIP
+
+bootstack-stage2-overcloud:
+  inherits: [bootstack-stage1-overcloud, bootstack-stage2]
+  services:
+    mysql:
+      to: null
+      num_units: 2
+    ceph:
+      options:
+        ceph-cluster-network: *BOB_CEPH_NET
+        ceph-public-network: *BOB_CEPH_NET
+        osd-devices: /srv
+    ceph-osd:
+      options:
+        ceph-cluster-network: *BOB_CEPH_NET
+        ceph-public-network: *BOB_CEPH_NET
+        osd-devices: /srv
+    swift-storage-z1:
+      options:
+        block-device: /swift.img|1G
+    swift-storage-z2:
+      options:
+        block-device: /swift.img|1G
+    swift-storage-z3:
+      options:
+        block-device: /swift.img|1G
+    swift-proxy:
+      to: null
+      options:
+        vip: *BOB_SWIFT_VIP
+    ceilometer:
+      to: null
+      options:
+        vip: *BOB_CEILOMETER_VIP
+    heat:
+      to: null
+    cinder:
+      to: null
+      options:
+        vip: *BOB_CINDER_VIP
+    glance:
+      to: null
+      options:
+        vip: *BOB_GLANCE_VIP
+    keystone:
+      to: null
+      options:
+        vip: *BOB_KEYSTONE_VIP
+    ncc-memcached:
+      to: null
+    nova-cloud-controller:
+      to: null
+      options:
+        vip: *BOB_NCC_VIP
+    openstack-dashboard:
+      to: null
+      options:
+        vip: *BOB_DASH_VIP
+    neutron-api:
+      to: null
+      options:
+        vip: *BOB_NCC_VIP
+    glance-simplestreams-sync:
+      to: null
+    rabbitmq-server:
+      to: null
+    mongodb:
+      to: null
+
+bootstack-stage2-complete-overcloud:
+  inherits: [bootstack-stage2-overcloud, bootstack-stage2-relations]
+  services:
+    # HACK: add the 3rd units to all
+    rabbitmq-server:
+      num_units: 3
+      to: null
+    mysql:
+      num_units: 3
+      to: null
+    mongodb:
+      num_units: 3
+      to: null

=== added file 'specs/bootstack/customer/configs/bootstack-repo'
--- specs/bootstack/customer/configs/bootstack-repo	1970-01-01 00:00:00 +0000
+++ specs/bootstack/customer/configs/bootstack-repo	2015-04-27 20:19:34 +0000
@@ -0,0 +1,24 @@
+ceilometer
+ceilometer-agent
+ceph
+ceph-osd
+cinder
+glance
+glance-simplestreams-sync
+hacluster
+heat
+keystone
+memcached
+mongodb
+mysql
+neutron-api
+neutron-openvswitch
+nova-cloud-controller
+nova-compute
+ntp
+openstack-dashboard
+quantum-gateway
+rabbitmq-server
+swift-proxy
+swift-storage
+ubuntu

=== added file 'specs/bootstack/customer/configs/glance-streams.yaml'
--- specs/bootstack/customer/configs/glance-streams.yaml	1970-01-01 00:00:00 +0000
+++ specs/bootstack/customer/configs/glance-streams.yaml	2015-04-27 20:19:34 +0000
@@ -0,0 +1,7 @@
+[{ url: 'http://cloud-images.ubuntu.com/releases/',
+   name_prefix: 'ubuntu:released',
+   path: 'streams/v1/index.sjson',
+   max: 1,
+   item_filters: ['arch~(amd64|x86_64)', 'ftype~(disk1.img|disk.img)']
+ }
+]

=== added file 'specs/bootstack/customer/configs/keystone_users.yaml'
--- specs/bootstack/customer/configs/keystone_users.yaml	1970-01-01 00:00:00 +0000
+++ specs/bootstack/customer/configs/keystone_users.yaml	2015-04-27 20:19:34 +0000
@@ -0,0 +1,5 @@
+- email: [e-mail]
+  password: pass
+  roles: [_member_]
+  tenant: bootstack_project
+  username: bootstack

=== added file 'specs/bootstack/customer/configs/network.yaml'
--- specs/bootstack/customer/configs/network.yaml	1970-01-01 00:00:00 +0000
+++ specs/bootstack/customer/configs/network.yaml	2015-04-27 20:19:34 +0000
@@ -0,0 +1,14 @@
+gre:
+  default_gateway: 172.22.0.1
+  start_floating_ip: 172.22.0.2
+  end_floating_ip: 172.22.0.62
+  external_dns: 8.8.8.8
+  external_net_cidr: 172.22.0.0/24
+  external_net_name: ext_net
+  external_subnet_name: subnet_ext_net
+  network_type: gre
+  private_net_cidr: 172.20.0.0/23
+  private_subnet_name: subnet_bootstack
+  private_net_name: net_bootstack
+  router_name: router_bootstack
+  dvr_enabled: False

=== added directory 'specs/bootstack/ha_phased'
=== added directory 'specs/bootstack/ha_phased/icehouse'
=== added file 'specs/bootstack/ha_phased/icehouse/SPEC_INFO.txt'
--- specs/bootstack/ha_phased/icehouse/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/bootstack/ha_phased/icehouse/SPEC_INFO.txt	2015-04-27 20:19:34 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy then runs tests to validate the
+deployment

=== added symlink 'specs/bootstack/ha_phased/icehouse/allow_vips_addresses.py'
=== target is u'../../../../helper/setup/allow_vips_addresses.py'
=== added file 'specs/bootstack/ha_phased/icehouse/bootstack-charms-1504.bzr'
--- specs/bootstack/ha_phased/icehouse/bootstack-charms-1504.bzr	1970-01-01 00:00:00 +0000
+++ specs/bootstack/ha_phased/icehouse/bootstack-charms-1504.bzr	2015-04-27 20:19:34 +0000
@@ -0,0 +1,35 @@
+#openstack:
+ubuntu                      lp:charms/trusty/ubuntu;revno=10
+ubuntu-nagios               lp:charms/trusty/ubuntu;revno=10
+ntp                         lp:charms/trusty/ntp;revno=19
+hacluster                   lp:charms/trusty/hacluster;revno=48
+nova-compute                lp:charms/trusty/nova-compute;revno=130
+ceph                        lp:charms/trusty/ceph;revno=107
+ceph-osd                    lp:charms/trusty/ceph-osd;revno=42
+quantum-gateway             lp:charms/trusty/quantum-gateway;revno=108
+neutron-api                 lp:charms/trusty/neutron-api;revno=110
+neutron-openvswitch         lp:charms/trusty/neutron-openvswitch;revno=64
+swift-proxy                 lp:charms/trusty/swift-proxy;revno=97
+swift-storage               lp:charms/trusty/swift-storage;revno=66
+ceilometer                  lp:charms/trusty/ceilometer;revno=84
+ceilometer-agent            lp:charms/trusty/ceilometer-agent;revno=56
+heat                        lp:charms/trusty/heat;revno=33
+cinder                      lp:charms/trusty/cinder;revno=91
+glance                      lp:charms/trusty/glance;revno=113
+glance-simplestreams-sync   lp:charms/trusty/glance-simplestreams-sync;revno=52
+keystone                    lp:charms/trusty/keystone;revno=148
+nova-cloud-controller       lp:charms/trusty/nova-cloud-controller;revno=163
+openstack-dashboard         lp:charms/trusty/openstack-dashboard;revno=64
+mysql                       lp:charms/trusty/percona-cluster;revno=57
+rabbitmq-server             lp:charms/trusty/rabbitmq-server;revno=99
+mongodb                     lp:charms/trusty/mongodb;revno=68
+memcached                   lp:charms/trusty/memcached;revno=69
+
+## #landscape:
+## postgresql                 lp:charms/trusty/postgresql
+## apache2                    lp:charms/trusty/apache2
+## haproxy                    lp:charms/trusty/haproxy
+## landscape                  lp:~landscape/landscape-charm/trunk
+
+#ksplice:
+#trusty/ksplice                   lp:~canonical-sysadmins/canonical-is-charms/ksplice

=== added file 'specs/bootstack/ha_phased/icehouse/bootstack-charms-trunk.bzr'
--- specs/bootstack/ha_phased/icehouse/bootstack-charms-trunk.bzr	1970-01-01 00:00:00 +0000
+++ specs/bootstack/ha_phased/icehouse/bootstack-charms-trunk.bzr	2015-04-27 20:19:34 +0000
@@ -0,0 +1,35 @@
+#openstack:
+ubuntu                     lp:charms/trusty/ubuntu
+ubuntu-nagios              lp:charms/trusty/ubuntu
+ntp                        lp:charms/trusty/ntp
+hacluster                  lp:charms/trusty/hacluster
+nova-compute               lp:charms/trusty/nova-compute
+ceph                       lp:charms/trusty/ceph
+ceph-osd                   lp:charms/trusty/ceph-osd
+quantum-gateway            lp:charms/trusty/quantum-gateway
+neutron-api                lp:charms/trusty/neutron-api
+neutron-openvswitch        lp:charms/trusty/neutron-openvswitch
+swift-proxy                lp:charms/trusty/swift-proxy
+swift-storage              lp:charms/trusty/swift-storage
+ceilometer                 lp:charms/trusty/ceilometer
+ceilometer-agent           lp:charms/trusty/ceilometer-agent
+heat                       lp:charms/trusty/heat
+cinder                     lp:charms/trusty/cinder
+glance                     lp:charms/trusty/glance
+glance-simplestreams-sync  lp:charms/trusty/glance-simplestreams-sync
+keystone                   lp:charms/trusty/keystone
+nova-cloud-controller      lp:charms/trusty/nova-cloud-controller
+openstack-dashboard        lp:charms/trusty/openstack-dashboard
+mysql                      lp:charms/trusty/percona-cluster
+rabbitmq-server            lp:charms/trusty/rabbitmq-server
+mongodb                    lp:charms/trusty/mongodb
+memcached                  lp:charms/trusty/memcached
+
+## #landscape:
+## postgresql                 lp:charms/trusty/postgresql
+## apache2                    lp:charms/trusty/apache2
+## haproxy                    lp:charms/trusty/haproxy
+## landscape                  lp:~landscape/landscape-charm/trunk
+
+#ksplice:
+#trusty/ksplice                   lp:~canonical-sysadmins/canonical-is-charms/ksplice

=== added symlink 'specs/bootstack/ha_phased/icehouse/bootstack-charms.bzr'
=== target is u'../../customer/configs/bootstack-charms.bzr'
=== added symlink 'specs/bootstack/ha_phased/icehouse/bootstack-example.yaml'
=== target is u'../../customer/configs/bootstack-example.yaml'
=== added symlink 'specs/bootstack/ha_phased/icehouse/bootstack-repo'
=== target is u'../../customer/configs/bootstack-repo'
=== added symlink 'specs/bootstack/ha_phased/icehouse/bootstrap_ha.py'
=== target is u'../../../../helper/setup/bootstrap_ha.py'
=== added symlink 'specs/bootstack/ha_phased/icehouse/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/bootstack/ha_phased/icehouse/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added file 'specs/bootstack/ha_phased/icehouse/fix-lxcbr0.sh'
--- specs/bootstack/ha_phased/icehouse/fix-lxcbr0.sh	1970-01-01 00:00:00 +0000
+++ specs/bootstack/ha_phased/icehouse/fix-lxcbr0.sh	2015-04-27 20:19:34 +0000
@@ -0,0 +1,2 @@
+#!/bin/bash
+juju set openstack-ha new-lxc-network=True

=== added symlink 'specs/bootstack/ha_phased/icehouse/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/bootstack/ha_phased/icehouse/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/bootstack/ha_phased/icehouse/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/bootstack/ha_phased/icehouse/keystone_users.yaml'
=== target is u'../../customer/configs/keystone_users.yaml'
=== added file 'specs/bootstack/ha_phased/icehouse/manifest'
--- specs/bootstack/ha_phased/icehouse/manifest	1970-01-01 00:00:00 +0000
+++ specs/bootstack/ha_phased/icehouse/manifest	2015-04-27 20:19:34 +0000
@@ -0,0 +1,53 @@
+#verify config=bootstrap_ha.py M0_CONSTRAINTS='bootstrap' M12_CONSTRAINTS='openstack-ha' HA_SERVICENAME='openstack-ha'
+verify config=bootstrap_ha.py HA_SERVICENAME='openstack-ha'
+
+# script config=fix-lxcbr0.sh
+# bootstack: Collect the charm branches from Launchpad
+# collect config=bootstack-charms.bzr
+collect config=bootstack-charms-1504.bzr
+
+# bootstack: Copy the branches to the deployment directory
+repo config=bootstack-repo
+
+# bootstack: bootstack-example-secrets.yaml
+# secrets
+
+# Use juju deployer to create the units for the deployment
+# orig: deploy config=haphase1.yaml delay=0 target=${MOJO_SERIES}-icehouse
+# bootstack: deploy config=bootstack-staging.yaml local=bootstack-staging-secrets.yaml delay=0 target=bootstack-stage1
+deploy config=bootstack-example.yaml retry=2 delay=0 target=bootstack-stage1-overcloud
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# # Examine the available networks and set vips for services
+# script config=set_vips.py
+
+# Use juju deployer to add the relations for the deployment
+# orig: deploy config=haphase2.yaml delay=0 target=${MOJO_SERIES}-icehouse
+# bootstack: deploy config=bootstack-staging.yaml local=bootstack-staging-secrets.yaml delay=0 target=bootstack-stage2
+deploy config=bootstack-example.yaml retry=2 delay=0 target=bootstack-stage2-overcloud
+
+# overcloud BoB needs neutron ports to know about vips:
+script config=allow_vips_addresses.py
+
+deploy config=bootstack-example.yaml retry=2 delay=0 target=bootstack-stage2-relations
+deploy config=bootstack-example.yaml retry=2 delay=0 target=bootstack-stage2-complete-overcloud
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300" NET_NAME="net_bootstack"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py

=== added symlink 'specs/bootstack/ha_phased/icehouse/network.yaml'
=== target is u'../../customer/configs/network.yaml'
=== added symlink 'specs/bootstack/ha_phased/icehouse/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/bootstack/ha_phased/icehouse/repo-next-ha'
=== target is u'../../../../helper/collect/repo-next-ha'
=== added symlink 'specs/bootstack/ha_phased/icehouse/set_vips.py'
=== target is u'../../../../helper/setup/set_vips.py'
=== added symlink 'specs/bootstack/ha_phased/icehouse/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/bootstack/ha_phased/icehouse/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/bootstack/ha_phased/icehouse/utils'
=== target is u'../../../../helper/utils'
=== modified file 'specs/dev/nova_cc_legacy_neutron/simple_os_checks.py'
--- specs/dev/nova_cc_legacy_neutron/simple_os_checks.py	2015-01-22 11:31:51 +0000
+++ specs/dev/nova_cc_legacy_neutron/simple_os_checks.py	2015-04-27 20:19:34 +0000
@@ -13,11 +13,13 @@
     parser.add_argument("--active_wait", default=180)
     parser.add_argument("--cloudinit_wait", default=180)
     parser.add_argument("--ping_wait", default=180)
+    parser.add_argument("--net_name", default='private')
     options = parser.parse_args()
     machines = mojo_utils.parse_mojo_arg(options, 'machines', multiargs=True)
     active_wait = int(mojo_utils.parse_mojo_arg(options, 'active_wait'))
     cloudinit_wait = int(mojo_utils.parse_mojo_arg(options, 'cloudinit_wait'))
     ping_wait = int(mojo_utils.parse_mojo_arg(options, 'ping_wait'))
+    net_name = mojo_utils.parse_mojo_arg(options, 'net_name')
     logging.basicConfig(level=logging.INFO)
     overcloud_novarc = mojo_utils.get_overcloud_auth()
     novac = mojo_os_utils.get_nova_client(overcloud_novarc)
@@ -30,6 +32,7 @@
                                     flavor_name=flavor_name,
                                     number=int(count),
                                     privkey=priv_key,
+                                    net_name=net_name,
                                     active_wait=active_wait,
                                     cloudinit_wait=cloudinit_wait,
                                     ping_wait=ping_wait)

=== modified file 'specs/dev/nova_cc_legacy_neutron/utils/mojo_os_utils.py'
--- specs/dev/nova_cc_legacy_neutron/utils/mojo_os_utils.py	2015-01-22 11:31:51 +0000
+++ specs/dev/nova_cc_legacy_neutron/utils/mojo_os_utils.py	2015-04-27 20:19:34 +0000
@@ -198,8 +198,8 @@
         mojo_utils.juju_set('neutron-gateway', 'ext-port=eth1')
 
 
-def create_tenant_network(neutron_client, tenant_id, net_name='private',
-                          shared=False, network_type='gre'):
+def create_tenant_network(neutron_client, tenant_id, net_name, shared=False,
+                          network_type='gre'):
     networks = neutron_client.list_networks(name=net_name)
     if len(networks['networks']) == 0:
         logging.info('Creating network: %s',
@@ -221,7 +221,7 @@
     return network
 
 
-def create_external_network(neutron_client, tenant_id, net_name='ext_net',
+def create_external_network(neutron_client, tenant_id, net_name,
                             network_type='gre'):
     networks = neutron_client.list_networks(name=net_name)
     if len(networks['networks']) == 0:
@@ -246,8 +246,8 @@
     return network
 
 
-def create_tenant_subnet(neutron_client, tenant_id, network, cidr, dhcp=True,
-                         subnet_name='private_subnet'):
+def create_tenant_subnet(neutron_client, tenant_id, network, cidr, subnet_name,
+                         dhcp=True):
     # Create subnet
     subnets = neutron_client.list_subnets(name=subnet_name)
     if len(subnets['subnets']) == 0:
@@ -269,10 +269,9 @@
     return subnet
 
 
-def create_external_subnet(neutron_client, tenant_id, network,
+def create_external_subnet(neutron_client, tenant_id, network, subnet_name,
                            default_gateway=None, cidr=None,
-                           start_floating_ip=None, end_floating_ip=None,
-                           subnet_name='ext_net_subnet'):
+                           start_floating_ip=None, end_floating_ip=None):
     subnets = neutron_client.list_subnets(name=subnet_name)
     if len(subnets['subnets']) == 0:
         subnet_msg = {
@@ -314,20 +313,20 @@
     neutron_client.update_subnet(subnet['id'], msg)
 
 
-def create_provider_router(neutron_client, tenant_id):
-    routers = neutron_client.list_routers(name='provider-router')
+def create_provider_router(neutron_client, tenant_id, router_name):
+    routers = neutron_client.list_routers(name=router_name)
     if len(routers['routers']) == 0:
         logging.info('Creating provider router for external network access')
         router_info = {
             'router': {
-                'name': 'provider-router',
+                'name': router_name,
                 'tenant_id': tenant_id
             }
         }
         router = neutron_client.create_router(router_info)['router']
-        logging.info('New router created: %s', (router['id']))
+        logging.info('New router "%s" created: %s', router_name, router['id'])
     else:
-        logging.warning('Router provider-router already exists.')
+        logging.warning('Router %s already exists.', router_name)
         router = routers['routers'][0]
     return router
 
@@ -375,10 +374,10 @@
     return new_key.private_key
 
 
-def boot_instance(nova_client, image_name, flavor_name, key_name):
+def boot_instance(nova_client, image_name, flavor_name, key_name, net_name):
     image = nova_client.images.find(name=image_name)
     flavor = nova_client.flavors.find(name=flavor_name)
-    net = nova_client.networks.find(label="private")
+    net = nova_client.networks.find(label=net_name)
     nics = [{'net-id': net.id}]
     # Obviously time may not produce a unique name
     vm_name = time.strftime("%Y%m%d%H%M%S")
@@ -506,13 +505,15 @@
 
 
 def boot_and_test(nova_client, image_name, flavor_name, number, privkey,
-                  active_wait=180, cloudinit_wait=180, ping_wait=180):
+                  net_name, active_wait=180, cloudinit_wait=180,
+                  ping_wait=180):
     image_config = mojo_utils.get_mojo_config('images.yaml')
     for counter in range(number):
         instance = boot_instance(nova_client,
                                  image_name=image_name,
                                  flavor_name=flavor_name,
-                                 key_name='mojo')
+                                 key_name='mojo',
+                                 net_name=net_name)
         wait_for_boot(nova_client, instance.name,
                       image_config[image_name]['bootstring'], active_wait,
                       cloudinit_wait)

=== modified file 'specs/dev/nova_cc_legacy_neutron/utils/mojo_utils.py'
--- specs/dev/nova_cc_legacy_neutron/utils/mojo_utils.py	2015-01-22 11:31:51 +0000
+++ specs/dev/nova_cc_legacy_neutron/utils/mojo_utils.py	2015-04-27 20:19:34 +0000
@@ -32,7 +32,7 @@
     else:
         services = [service for service in juju_status['services']]
     for svc in services:
-        if 'units' in juju_status['services'][svc]:
+        if 'units' in juju_status['services'].get(svc, {}):
             for unit in juju_status['services'][svc]['units']:
                 units.append(unit)
     return units