summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rwxr-xr-xlib/post-install-functions.sh12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index abc43952..a93ad541 100755
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -131,13 +131,19 @@ fi
if [ "${deploy_options_array['congress']}" == 'True' ]; then
ds_configs="--config username=\$OS_USERNAME
- --config tenant_name=service
+ --config tenant_name=\$OS_PROJECT_NAME
--config password=\$OS_PASSWORD
--config auth_url=\$OS_AUTH_URL"
- for s in nova neutronv2 ceilometer cinder glancev2 keystone; do
+ for s in nova neutronv2 cinder glancev2 keystone; do
ds_extra_configs=""
if [ "\$s" == "nova" ]; then
- nova_micro_version=\$(nova version-list | grep CURRENT | awk '{print \$10}')
+ # nova's latest version is 2.38 but congress relies on nova to do
+ # floating ip operation instead of neutron. fip support in nova
+ # was depricated as of 2.35. Hard coding 2.34 for danube.
+ # Carlos.Goncalves working on fixes for upstream congress that
+ # should be ready for ocata.
+ nova_micro_version="2.34"
+ #nova_micro_version=\$(nova version-list | grep CURRENT | awk '{print \$10}')
ds_extra_configs+="--config api_version=\$nova_micro_version"
fi
if openstack congress datasource create \$s "\$s" \$ds_configs \$ds_extra_configs; then