From ea64dc22ea171d45ae60aff682fcadf9d525889b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 8 Sep 2017 23:03:56 +0200 Subject: states: Split virtual_control_plane from maas We should eventually also support baremetal deploys without a virtualized control plane (VCP), so decouple MaaS provisioning from VCP provisioning. While at it, move "wait_for" bash function from maas state to common library file, lib.sh. Change-Id: I32c33135655cb6aceae901a5f92b51265a8c84b4 Signed-off-by: Alexandru Avadanii (cherry picked from commit ebd7067904b36ae32566da63e433365948a1f973) --- 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 + 3 files changed, 3 insertions(+) (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 ca5b6a24d..881359b24 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml @@ -3,6 +3,7 @@ cluster: domain: baremetal-mcp-ocata-ovs-ha.local states: - maas + - virtual_control_plane - openstack_ha - networks virtual: diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml index 6eb1e33ce..8b937835c 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml @@ -3,6 +3,7 @@ cluster: domain: baremetal-mcp-ocata-ovs-dpdk-ha.local states: - maas + - virtual_control_plane - dpdk - openstack_ha - neutron_compute diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml index 893b6797b..b48738562 100644 --- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml +++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml @@ -3,6 +3,7 @@ cluster: domain: baremetal-mcp-ocata-odl-ha.local states: - maas + - virtual_control_plane - opendaylight - openstack_ha - networks -- cgit 1.2.3-korg