Fixes FDIO kernel settings

[apex.git] / lib / post-install-functions.sh

diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index bf0b444..6e9859a 100755 (executable)
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -111,19 +111,33 @@ 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
+        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
     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
 
   # for virtual, we NAT public network through Undercloud
-  if [ "$virtual" == "TRUE" ] && [ "$public_network_ipv6" != "True" ]; then
+  # same goes for baremetal if only jumphost has external connectivity
+  if [ "$virtual" == "TRUE" ] || ! test_overcloud_connectivity && [ "$public_network_ipv6" != "True" ]; then
     if ! configure_undercloud_nat ${public_network_cidr}; then
       echo -e "${red}ERROR: Unable to NAT undercloud with external net: ${public_network_cidr}${reset}"
       exit 1