← Back to branch summary

~openstack-charm-testers/openstack-charm-testing/openstack-monitoring

« back to all changes in this revision

Viewing changes to bin/post-deploy-config

  • Committer: Edward Hope-Morley
  • Date: 2016-12-05 15:01:45 UTC
  • mfrom: (220.1.37 openstack-charm-testing)
  • Revision ID: edward.hope-morley@canonical.com-20161205150145-5xs44qcs5ifqsnl5
rebase

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/post-deploy-config
19
19
                            os.environ['OS_PASSWORD'],
20
20
                            os.environ['OS_TENANT_NAME'],
21
21
                            os.environ['OS_AUTH_URL'],
22
 
                            os.environ['OS_REGION_NAME'])
 
22
                            region_name=os.environ['OS_REGION_NAME'])
23
23
 
24
24
    net_id = os.environ.get('NET_ID')
25
25
    if net_id:
38
38
 
39
39
    service = sys.argv[1]
40
40
 
 
41
    juju_version = int(subprocess.check_output(['juju', 'version']).strip()[0])
 
42
 
41
43
    service_config = yaml.load(
42
 
        subprocess.check_output(['juju', 'status', service])
 
44
        subprocess.check_output(['juju', 'status', '--format=yaml',
 
45
                                 service])
43
46
    )
44
47
 
45
48
    uuids = []
59
62
                                             fixed_ip=None).to_dict()
60
63
            ext_port.append("br-ex:{}".format(result['mac_addr']))
61
64
 
 
65
    if juju_version == 1:
 
66
        config_cmd = 'set'
 
67
    else:
 
68
        config_cmd = 'config'
 
69
 
62
70
    ports = " ".join(ext_port)
63
 
    print("Setting ext-port configuration on {} to {}".format(service, ports))
64
 
    subprocess.check_call(['juju', 'set', service, 'data-port={}'.format(ports)])
 
71
    print("Setting data-port configuration on {} to {}".format(service, ports))
 
72
    subprocess.check_call(['juju', config_cmd, service, 'data-port={}'.format(ports)])
65
73