Merge "Updates the real time kvm kernel from 4.4.6-rt14 to 4.4.50-rt62."

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

diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index b723595..a93ad54 100755 (executable)
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -129,17 +129,21 @@ if [ "${deploy_options_array['dataplane']}" == 'fdio' ] || [ "${deploy_options_a
     done
 fi
 
-# TODO: Change this back to True once everything is back in
-#       place with tht and puppet-congress for deployment
-if [ "${deploy_options_array['congress']}" == 'NeverTrue' ]; then
+if [ "${deploy_options_array['congress']}" == 'True' ]; then
     ds_configs="--config username=\$OS_USERNAME
-                --config tenant_name=\$OS_TENANT_NAME
+                --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
@@ -215,16 +219,29 @@ EOI
     overcloud_connect "compute0" "sudo sh -c 'cd /var/opt/vsperf/systems/ && ./build_base_machine.sh 2>&1 > /var/log/vsperf.log'"
   fi
 
-  # install docker and pull yardstick image
-  if [[ "${deploy_options_array['yardstick']}" == 'True' ]]; then
+  # install docker
+  if [ "${deploy_options_array['yardstick']}" == 'True' ] || [ "${deploy_options_array['dovetail']}" == 'True' ]; then
     ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
 sudo yum install docker -y
 sudo systemctl start docker
 sudo systemctl enable docker
+EOI
+  fi
+
+  # pull yardstick image
+  if [ "${deploy_options_array['yardstick']}" == 'True' ]; then
+    ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
 sudo docker pull opnfv/yardstick
 EOI
   fi
 
+  # pull dovetail image
+  if [ "${deploy_options_array['dovetail']}" == 'True' ]; then
+    ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+sudo docker pull opnfv/dovetail
+EOI
+  fi
+
   # Collect deployment logs
   ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
 mkdir -p ~/deploy_logs
@@ -268,8 +285,6 @@ if [[ "$ha_enabled" == 'True' ]]; then
     echo "${blue}\nChecking pacemaker service status\n${reset}"
   fi
   overcloud_connect "controller0" "for i in \$(sudo pcs status | grep '^* ' | cut -d ' ' -f 2 | cut -d '_' -f 1 | uniq); do echo \"WARNING: Service: \$i not running\"; done"
-  # trozet disable congress in HA until congress bugs are fixed
-  overcloud_connect "controller0" "sudo pcs resource ban openstack-congress overcloud-controller-1; sudo pcs resource ban openstack-congress overcloud-controller-2; sudo systemctl restart openstack-congress"
 fi
 
 if [ "${deploy_options_array['vpn']}" == 'True' ]; then