Merge "Adds scenario deploy settings files"

8 files changed, 64 insertions, 4 deletions

diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec
index 15fd9e1f..9aaf088d 100644
--- a/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@ -29,7 +29,11 @@ install ci/deploy.sh %{buildroot}%{_bindir}/opnfv-deploy
 install ci/clean.sh %{buildroot}%{_bindir}/opnfv-clean
 
 mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/
-install config/deploy/deploy_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/deploy_settings.yaml
+install config/deploy/os-odl_l2-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
+install config/deploy/os-odl_l2-sfc-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-ha.yaml
+install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
+install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml
+install config/deploy/os-opencontrail-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-opencontrail-nofeature-ha.yaml
 install config/deploy/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings.yaml
 
 mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/
@@ -49,7 +53,11 @@ install config/deploy/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv
 %attr(755,root,root) %{_bindir}/opnfv-deploy
 %attr(755,root,root) %{_bindir}/opnfv-clean
 %{_var}/opt/opnfv/lib/common-functions.sh
-%{_sysconfdir}/opnfv-apex/deploy_settings.yaml
+%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-opencontrail-nofeature-ha.yaml
 %{_sysconfdir}/opnfv-apex/network_settings.yaml
 %doc %{_docdir}/opnfv/LICENSE.rst
 %doc %{_docdir}/opnfv/installation-instructions.rst
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 02e98864..232d8251 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -763,7 +763,7 @@ sleep 15
 ##preping it for deployment and launch the deploy
 ##params: none
 function undercloud_prep_overcloud_deploy {
-
+  # TODO ADD ODL L3 logic here
   if [[ ${#deploy_options_array[@]} -eq 0 || ${deploy_options_array['sdn_controller']} == 'opendaylight' ]]; then
     DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml"
   elif [ ${deploy_options_array['sdn_controller']} == 'opendaylight-external' ]; then
@@ -963,7 +963,7 @@ parse_cmdline() {
   if [[ ! -z "$NETSETS" && "$net_isolation_enabled" == "FALSE" ]]; then
     echo -e "${red}INFO: Single flat network requested. Ignoring any network settings!${reset}"
   elif [[ -z "$NETSETS" && "$net_isolation_enabled" == "TRUE" ]]; then
-    echo -e "${red}ERROR: You must provide a network_settings file with -n or use --flat to force a single flat network{reset}"
+    echo -e "${red}ERROR: You must provide a network_settings file with -n or use --flat to force a single flat network${reset}"
     exit 1
   fi
 
@@ -991,6 +991,11 @@ parse_cmdline() {
     echo -e "${red}ERROR: You must specify an inventory file for baremetal deployments! Exiting...${reset}"
     exit 1
   fi
+
+  if [[ "$net_isolation_enabled" == "FALSE" && "$post_config" == "TRUE" ]]; then
+    echo -e "${blue}INFO: Post Install Configuration will be skipped.  It is not supported with --flat${reset}"
+    post_config="FALSE"
+  fi
 }
 
 ##END FUNCTIONS
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 15157f12..04101485 100644
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -3,5 +3,7 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
+  sdn_l3: false
   tacker: false
   congress: false
+  sfc: false
diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
new file mode 100644
index 00000000..04101485
--- /dev/null
+++ b/config/deploy/os-odl_l2-nofeature-ha.yaml
@@ -0,0 +1,9 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opendaylight
+  sdn_l3: false
+  tacker: false
+  congress: false
+  sfc: false
diff --git a/config/deploy/os-odl_l2-sfc-ha.yaml b/config/deploy/os-odl_l2-sfc-ha.yaml
new file mode 100644
index 00000000..d2e49bed
--- /dev/null
+++ b/config/deploy/os-odl_l2-sfc-ha.yaml
@@ -0,0 +1,9 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opendaylight
+  sdn_l3: false
+  tacker: false
+  congress: false
+  sfc: true
diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml
new file mode 100644
index 00000000..84f97602
--- /dev/null
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -0,0 +1,9 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opendaylight
+  sdn_l3: true
+  tacker: false
+  congress: false
+  sfc: false
diff --git a/config/deploy/os-onos-nofeature-ha.yaml b/config/deploy/os-onos-nofeature-ha.yaml
new file mode 100644
index 00000000..e7c41d54
--- /dev/null
+++ b/config/deploy/os-onos-nofeature-ha.yaml
@@ -0,0 +1,9 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: onos
+  sdn_l3: false
+  tacker: false
+  congress: false
+  sfc: false
diff --git a/config/deploy/os-opencontrail-nofeature-ha.yaml b/config/deploy/os-opencontrail-nofeature-ha.yaml
new file mode 100644
index 00000000..f6ac253b
--- /dev/null
+++ b/config/deploy/os-opencontrail-nofeature-ha.yaml
@@ -0,0 +1,9 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opencontrail
+  sdn_l3: false
+  tacker: false
+  congress: false
+  sfc: false