summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-08-18 14:25:10 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-18 14:25:10 +0000
commitc3e9e5e38cf34ab9b6b40a6fa7fcfaaa0676b9ea (patch)
tree5933645bd3f86ea53fa13ec4e09fa8d32e1f26e6 /lib
parent22e8ced8778bbfcf1f396abf4a829cf0564ba90a (diff)
parent1f6156f53e7e687fcc2841a9cd8018662e2124e2 (diff)
Merge "Create Congress Nova datasource with api_version"
Diffstat (limited to 'lib')
-rwxr-xr-xlib/post-install-functions.sh15
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index a7499feb..7df55cd5 100755
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -111,12 +111,17 @@ openstack endpoint delete \$swift_endpoint_id
openstack service delete \$swift_service_id
if [ "${deploy_options_array['congress']}" == 'True' ]; then
+ ds_configs="--config username=\$OS_USERNAME
+ --config tenant_name=\$OS_TENANT_NAME
+ --config password=\$OS_PASSWORD
+ --config auth_Url=\$OS_AUTH_URL"
for s in nova neutronv2 ceilometer cinder glancev2 keystone; do
- openstack congress datasource create \$s "\$s" \\
- --config username=\$OS_USERNAME \\
- --config tenant_name=\$OS_TENANT_NAME \\
- --config password=\$OS_PASSWORD \\
- --config auth_url=\$OS_AUTH_URL
+ ds_extra_configs=""
+ if [ "\$s" == "nova" ]; then
+ nova_micro_version=\$(nova version-list | grep CURRENT | awk '{print \$10}')
+ ds_extra_configs+="--config api_version="\$nova_micro_version"
+ fi
+ openstack congress datasource create \$s "\$s" \$ds_configs \$ds_extra_configs
done
openstack congress datasource create doctor "doctor"
fi