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

Map relation settings to correct keystone settings in file.

This commit is contained in:
Adam Gandelman 2013-02-21 15:12:04 -08:00
parent fb803a20b9
commit ee28d55ab0
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,18 +406,20 @@ compute_joined() {
keystone_host=$keystone_host \
auth_port=$(local_config_get $API_CONF auth_port $sect) \
service_port=$(local_config_get $API_CONF service_port $sect) \
service_username=$(local_config_get $API_CONF service_username $sect) \
service_password=$(local_config_get $API_CONF service_password $sect) \
service_tenant=$(local_config_get $API_CONF service_tenant_name $sect) \
service_username=$(local_config_get $API_CONF admin_user $sect) \
service_password=$(local_config_get $API_CONF admin_password $sect) \
service_tenant=$(local_config_get $API_CONF admin_tenant_name $sect) \
auth_uri=$(local_config_get $API_CONF auth_uri $sect)
fi
if is_clustered; then
fi
if is_clustered; then
quantum_host=$(config-get vip)
quantum_port=19696
else
quantum_host=$(unit-get private-address)
quantum_port=9696
fi
relation-set quantum_host=$quantum_host \
quantum_port=$quantum_port \
quantum_plugin=$(config-get quantum-plugin)
@ -468,9 +470,9 @@ function quantum_joined() {
keystone_host=$keystone_host \
auth_port=$(local_config_get $API_CONF auth_port $sect) \
service_port=$(local_config_get $API_CONF service_port $sect) \
service_username=$(local_config_get $API_CONF service_username $sect) \
service_password=$(local_config_get $API_CONF service_password $sect) \
service_tenant=$(local_config_get $API_CONF service_tenant_name $sect) \
service_username=$(local_config_get $API_CONF admin_user $sect) \
service_password=$(local_config_get $API_CONF admin_password $sect) \
service_tenant=$(local_config_get $API_CONF admin_tenant_name $sect) \
auth_uri=$(local_config_get $API_CONF auth_uri $sect)
fi