diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-01 03:03:52 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-31 02:11:34 +0100 |
| commit | d706868ac3decd0df9dfce5d08508a477b47cc61 (patch) | |
| tree | 83373de133925cc13d5aa30932bc50fcfa9917fd /mcp/config/scenario | |
| parent | 2034819f0ea8c74626826815feb886135ebb39a7 (diff) | |
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 <Alexandru.Avadanii@enea.com>
(cherry picked from commmit 52e37b795bb975b1cb3bf1f684b009848c50a2d6)
Diffstat (limited to 'mcp/config/scenario')
6 files changed, 6 insertions, 3 deletions
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 ee5ed4e3a..51ddfc5f2 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 6eedeae2b..9138e998d 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-ocata-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 1e33bdae7..601a54100 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-ocata-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 d6e260104..80f48fc02 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-ocata-odl-router-noha.local states: - opendaylight - - openstack + - openstack_noha - networks virtual: nodes: |