openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Add region name to quantum helpers

Browse Source
This commit is contained in:
James Page 2013-01-22 14:07:47 -06:00
parent c1fa994a70
commit 4a9e30a095
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/create_ext_net.py
View File

@ -52,7 +52,8 @@ if __name__ == '__main__':
quantum = client.Client(username=os.environ['OS_USERNAME'], quantum = client.Client(username=os.environ['OS_USERNAME'],
password=os.environ['OS_PASSWORD'], password=os.environ['OS_PASSWORD'],
tenant_name=os.environ['OS_TENANT_NAME'], tenant_name=os.environ['OS_TENANT_NAME'],
auth_url=os.environ['OS_AUTH_URL']) auth_url=os.environ['OS_AUTH_URL'],
region_name=os.environ['OS_REGION_NAME'])
networks = quantum.list_networks(name=net_name) networks = quantum.list_networks(name=net_name)
if len(networks['networks']) == 0: if len(networks['networks']) == 0:

6
files/create_tenant_net.py
View File

@ -57,11 +57,13 @@ if __name__ == '__main__':
keystone = ks_client.Client(username=os.environ['OS_USERNAME'], keystone = ks_client.Client(username=os.environ['OS_USERNAME'],
password=os.environ['OS_PASSWORD'], password=os.environ['OS_PASSWORD'],
tenant_name=os.environ['OS_TENANT_NAME'], tenant_name=os.environ['OS_TENANT_NAME'],
auth_url=os.environ['OS_AUTH_URL']) auth_url=os.environ['OS_AUTH_URL'],
region_name=os.environ['OS_REGION_NAME'])
quantum = client.Client(username=os.environ['OS_USERNAME'], quantum = client.Client(username=os.environ['OS_USERNAME'],
password=os.environ['OS_PASSWORD'], password=os.environ['OS_PASSWORD'],
tenant_name=os.environ['OS_TENANT_NAME'], tenant_name=os.environ['OS_TENANT_NAME'],
auth_url=os.environ['OS_AUTH_URL']) auth_url=os.environ['OS_AUTH_URL'],
region_name=os.environ['OS_REGION_NAME'])
# Resolve tenant id # Resolve tenant id
tenant_id = None tenant_id = None

1
hooks/nova-cloud-controller-relations
View File

@ -312,6 +312,7 @@ export OS_USERNAME=${service_username}
export OS_PASSWORD=${service_password} export OS_PASSWORD=${service_password}
export OS_TENANT_NAME=${service_tenant} export OS_TENANT_NAME=${service_tenant}
export OS_AUTH_URL=${keystone_url} export OS_AUTH_URL=${keystone_url}
export OS_REGION_NAME=$region
EOF EOF
fi fi

2
revision
View File

@ -1 +1 @@
205 210