diff options
| -rw-r--r-- | config/deploy/os-odl_l2-sdnvpn-ha.yaml | 10 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 2 | ||||
| -rw-r--r-- | lib/utility-functions.sh | 22 | ||||
| -rw-r--r-- | tests/test_apex_deploy_settings.py | 3 |
4 files changed, 4 insertions, 33 deletions
diff --git a/config/deploy/os-odl_l2-sdnvpn-ha.yaml b/config/deploy/os-odl_l2-sdnvpn-ha.yaml deleted file mode 100644 index f6904f05..00000000 --- a/config/deploy/os-odl_l2-sdnvpn-ha.yaml +++ /dev/null @@ -1,10 +0,0 @@ -global_params: - ha_enabled: true - -deploy_options: - sdn_controller: opendaylight - sdn_l3: false - tacker: true - congress: true - sfc: false - vpn: true diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index e1e66306..23c6eaf3 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -134,7 +134,7 @@ EOI ;; boron) odl_version='boron' ;; - cabron) odl_version='master' + carbon) odl_version='master' ;; *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}. Please use 'carbon' or 'boron' values.${reset}" exit 1 diff --git a/lib/utility-functions.sh b/lib/utility-functions.sh index 5c28b46c..c12619ae 100644 --- a/lib/utility-functions.sh +++ b/lib/utility-functions.sh @@ -80,26 +80,6 @@ function opendaylight_connect { ##outputs heat stack deployment failures ##params: none function debug_stack { - local failure_output - local phys_id - declare -a resource_arr - declare -a phys_id_arr - source ~/stackrc - - IFS=$'\n' - for resource in $(openstack stack resource list -n 5 overcloud | grep FAILED); do - unset IFS - resource_arr=(${resource//|/ }) - phys_id=$(openstack stack resource show ${resource_arr[-1]} ${resource_arr[0]} | grep physical_resource_id 2> /dev/null) - if [ -n "$phys_id" ]; then - phys_id_arr=(${phys_id//|/ }) - failure_output+="******************************************************" - failure_output+="\n${resource}:\n\n$(openstack stack deployment show ${phys_id_arr[-1]} 2> /dev/null)" - failure_output+="\n******************************************************" - fi - unset phys_id - done - - echo -e $failure_output + openstack stack failures list overcloud --long } diff --git a/tests/test_apex_deploy_settings.py b/tests/test_apex_deploy_settings.py index 2af187b2..a0af1211 100644 --- a/tests/test_apex_deploy_settings.py +++ b/tests/test_apex_deploy_settings.py @@ -22,7 +22,8 @@ deploy_files = ('deploy_settings.yaml', 'os-nosdn-nofeature-noha.yaml', 'os-nosdn-ovs-noha.yaml', 'os-ocl-nofeature-ha.yaml', - 'os-odl_l2-sdnvpn-ha.yaml', + 'os-odl_l2-bgpvpn-ha.yaml', + 'os-odl_l2-bgpvpn-noha.yaml', 'os-odl_l3-nofeature-ha.yaml', 'os-nosdn-nofeature-ha.yaml', 'os-nosdn-ovs-ha.yaml', |