From 52e37b795bb975b1cb3bf1f684b009848c50a2d6 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 1 Dec 2017 03:03:52 +0100 Subject: states: Rename openstack, add baremetal_init To align with new cluster naming convention, rename 'openstack' state file to 'openstack_noha'. While at it, factor out baremetal setup from 'virtual_control_plane' into a new state that will be reused in upcoming scenarios, remove useless sync_all (automatically done after node reboot). FUEL-310 Change-Id: I6d7e5db8f09305f2fd8eeca0199a2e85b08d2202 Signed-off-by: Alexandru Avadanii --- mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml | 1 + mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml | 1 + mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml | 1 + mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml | 2 +- mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml | 2 +- mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) (limited to 'mcp/config/scenario') diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml index e135b7686..5315fdd97 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml @@ -10,6 +10,7 @@ cluster: domain: baremetal-mcp-ocata-ovs-ha.local states: - maas + - baremetal_init - virtual_control_plane - openstack_ha - networks diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml index 1766f9700..a0260a069 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml @@ -10,6 +10,7 @@ cluster: domain: baremetal-mcp-ocata-ovs-dpdk-ha.local states: - maas + - baremetal_init - virtual_control_plane - dpdk - openstack_ha diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml index 52a422b3c..825088169 100644 --- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml +++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml @@ -10,6 +10,7 @@ cluster: domain: baremetal-mcp-ocata-odl-ha.local states: - maas + - baremetal_init - virtual_control_plane - opendaylight - openstack_ha diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml index 55b433931..57369a906 100644 --- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml @@ -9,7 +9,7 @@ cluster: domain: virtual-mcp-pike-ovs-noha.local states: - - openstack + - openstack_noha - neutron_compute - networks virtual: diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml index 538ff9b72..7be0fd82a 100644 --- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml @@ -10,7 +10,7 @@ cluster: domain: virtual-mcp-pike-ovs-dpdk-noha.local states: - dpdk - - openstack + - openstack_noha - neutron_compute - networks virtual: diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml index d1662cac7..5d114ed72 100644 --- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml @@ -10,7 +10,7 @@ cluster: domain: virtual-mcp-pike-odl-noha.local states: - opendaylight - - openstack + - openstack_noha - networks virtual: nodes: -- cgit 1.2.3-korg