Merge "Add VBMC double check"
authorTim Rozet <trozet@redhat.com>
Thu, 18 May 2017 20:25:17 +0000 (20:25 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 18 May 2017 20:25:17 +0000 (20:25 +0000)
1  2 
lib/overcloud-deploy-functions.sh

@@@ -36,8 -36,10 +36,8 @@@ function overcloud_deploy 
      elif [ "${deploy_options_array['vpp']}" == 'True' ]; then
        if [ "${deploy_options_array['odl_vpp_netvirt']}" == "True" ]; then
          DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-netvirt-vpp.yaml"
 -      elif [ "${deploy_options_array['sdn_l3']}" == "True" ]; then
 -        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml"
        else
 -        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb-l2.yaml"
 +        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml"
        fi
      else
        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight.yaml"
@@@ -328,8 -330,11 +328,11 @@@ EO
    DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
    if [[ "$virtual" == "TRUE" ]]; then
       DEPLOY_OPTIONS+=" -e virtual-environment.yaml"
-      # double check the status of the vbmc devices
-      # TODO add some validation logic here
+      echo 'Ensuring Virtual BMC device status'
+      for i in $(vbmc list | grep down | awk '{ print $2}'); do
+          vbmc start $i
+          sleep 5
+      done
       vbmc list
    fi