aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/release/scenarios/index.rst2
-rw-r--r--docs/release/scenarios/os-nosdn-onap-ha/index.rst14
-rw-r--r--docs/release/scenarios/os-nosdn-onap-ha/os-nosdn-ovs-ha.rst48
-rw-r--r--docs/release/scenarios/os-nosdn-onap-noha/index.rst14
-rw-r--r--docs/release/scenarios/os-nosdn-onap-noha/os-nosdn-ovs-noha.rst45
-rwxr-xr-xmcp/config/states/virtual_control_plane4
6 files changed, 125 insertions, 2 deletions
diff --git a/docs/release/scenarios/index.rst b/docs/release/scenarios/index.rst
index 437a82e2d..9561aefbf 100644
--- a/docs/release/scenarios/index.rst
+++ b/docs/release/scenarios/index.rst
@@ -18,3 +18,5 @@ OPNFV Fuel Scenarios
os-nosdn-fdio-noha/index.rst
os-nosdn-fdio-ha/index.rst
os-odl-ovs-noha/index.rst
+ os-nosdn-onap-ha/index.rst
+ os-nosdn-onap-noha/index.rst
diff --git a/docs/release/scenarios/os-nosdn-onap-ha/index.rst b/docs/release/scenarios/os-nosdn-onap-ha/index.rst
new file mode 100644
index 000000000..bb2ae139c
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-onap-ha/index.rst
@@ -0,0 +1,14 @@
+.. _os-nosdn-onap-ha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB, Tieto and others
+
+========================================
+os-nosdn-ovs-ha overview and description
+========================================
+
+.. toctree::
+ :maxdepth: 2
+
+.. include:: os-nosdn-onap-ha.rst
diff --git a/docs/release/scenarios/os-nosdn-onap-ha/os-nosdn-ovs-ha.rst b/docs/release/scenarios/os-nosdn-onap-ha/os-nosdn-ovs-ha.rst
new file mode 100644
index 000000000..23b1adc40
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-onap-ha/os-nosdn-ovs-ha.rst
@@ -0,0 +1,48 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB, Tieto and others
+
+This document provides scenario level details for Hunter
+deployment, with no SDN controller, with ONAP deployed on top of OPNFV.
+
+
+Introduction
+============
+
+This scenario is used primarily to deploy a Queens OpenStack deployment,
+without any NFV features or SDN controller enabled, with an ONAP deployment
+managed by the OPNFV Auto project. This scenario is a "specific" scenario
+created from the "generic" scenario os-nosdn-nofeature-ha.
+
+
+Scenario components and composition
+===================================
+
+This scenario is composed of common OpenStack services enabled by default,
+including Nova, Neutron, Glance, Cinder, Keystone, Horizon. It also installs
+an ONAP deployment, managed by the OPNFV Auto project.
+
+All services are in HA, meaning that there are multiple cloned instances of
+each service, and they are balanced by HA Proxy using a Virtual IP Address
+per service.
+
+
+Scenario usage overview
+=======================
+
+Simply deploy this scenario by setting os-nosdn-onap-ha as scenario
+deploy parameter and refer to the Auto Project documentation for further
+setup instructions at https://wiki.opnfv.org/display/AUTO/Auto+Documentation .
+
+Limitations, Issues and Workarounds
+===================================
+
+None
+
+References
+==========
+
+For more information on the OPNFV Gambia release, please visit
+https://www.opnfv.org/software
+For setup instructions visit the Auto Project at,
+https://wiki.opnfv.org/display/AUTO/Auto+Documentation \ No newline at end of file
diff --git a/docs/release/scenarios/os-nosdn-onap-noha/index.rst b/docs/release/scenarios/os-nosdn-onap-noha/index.rst
new file mode 100644
index 000000000..7211f576d
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-onap-noha/index.rst
@@ -0,0 +1,14 @@
+.. _os-nosdn-onap-noha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International Licence.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB and others
+
+==========================================
+os-nosdn-ovs-noha overview and description
+==========================================
+
+.. toctree::
+ :maxdepth: 2
+
+.. include:: os-nosdn-onap-noha.rst
diff --git a/docs/release/scenarios/os-nosdn-onap-noha/os-nosdn-ovs-noha.rst b/docs/release/scenarios/os-nosdn-onap-noha/os-nosdn-ovs-noha.rst
new file mode 100644
index 000000000..93c06749f
--- /dev/null
+++ b/docs/release/scenarios/os-nosdn-onap-noha/os-nosdn-ovs-noha.rst
@@ -0,0 +1,45 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2018 Mirantis Inc., Enea Software AB, Tieto and others
+
+This document provides scenario level details for Hunter
+deployment, with no SDN controller, with ONAP deployed on top of OPNFV.
+
+
+Introduction
+============
+
+This scenario is used primarily to deploy a Queens OpenStack deployment,
+without any NFV features or SDN controller enabled, with an ONAP deployment
+managed by the OPNFV Auto project. This scenario is a "specific" scenario
+created from the "generic" scenario os-nosdn-nofeature-noha.
+
+
+Scenario components and composition
+===================================
+
+This scenario is composed of common OpenStack services enabled by default,
+including Nova, Neutron, Glance, Cinder, Keystone, Horizon. It also installs
+an ONAP deployment, managed by the OPNFV Auto project.
+
+
+Scenario usage overview
+=======================
+
+Simply deploy this scenario by setting os-nosdn-onap-noha as scenario
+deploy parameter and refer to the Auto Project documentation for further
+setup instructions at https://wiki.opnfv.org/display/AUTO/Auto+Documentation .
+
+
+Limitations, Issues and Workarounds
+===================================
+
+Tested on virtual deployment only.
+
+References
+==========
+
+For more information on the OPNFV Gambia release, please visit
+https://www.opnfv.org/software
+For setup instructions visit the Auto Project at,
+https://wiki.opnfv.org/display/AUTO/Auto+Documentation
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 5b54bb8a4..ffb2c594e 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -58,7 +58,7 @@ wait_for 10.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp"
wait_for 10.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
$(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
-salt -C 'prx*' system.reboot
-wait_for 30.0 "salt -C 'prx*' test.ping"
+salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' system.reboot
+wait_for 30.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' test.ping"
salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' pkg.upgrade refresh=False dist_upgrade=True