summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-29 17:45:03 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-29 17:45:03 +0000
commitf429ad9cc6c020a2154558356dc64b036a9b53f7 (patch)
tree10dd25f5d644f5cd29fce64595fb5c1ca3024b6e /lib
parent16ab950af532de3f618f26ff9fbfdf4ca3244f5c (diff)
parentd26cd6f8b4fc657e23c7cc1070d4fe5383a7a3f6 (diff)
Merge "Fixes datasource creation for congress"
Diffstat (limited to 'lib')
-rwxr-xr-xlib/post-install-functions.sh16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index 7df55cd5..6e9859a8 100755
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -114,16 +114,24 @@ 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"
+ --config auth_url=\$OS_AUTH_URL"
for s in nova neutronv2 ceilometer cinder glancev2 keystone; do
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"
+ ds_extra_configs+="--config api_version=\$nova_micro_version"
+ fi
+ if openstack congress datasource create \$s "\$s" \$ds_configs \$ds_extra_configs; then
+ echo "INFO: Datasource: \$s created"
+ else
+ echo "WARN: Datasource: \$s could NOT be created"
fi
- openstack congress datasource create \$s "\$s" \$ds_configs \$ds_extra_configs
done
- openstack congress datasource create doctor "doctor"
+ if openstack congress datasource create doctor "doctor"; then
+ echo "INFO: Datasource: doctor created"
+ else
+ echo "WARN: Datsource: doctor could NOT be created"
+ fi
fi
EOI