From f2ea17e489b4c3f5e0b5cdc75860b094f3a05b90 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 24 Aug 2017 15:45:04 +0400 Subject: [baremetal] Bring in ovs/dpdk scenario Change-Id: Ia0d828fa31549a12b6740e0edeeba2ab13a9b998 Signed-off-by: Michael Polenchuk --- mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml | 14 ++++++++++++++ mcp/config/states/dpdk | 2 +- mcp/config/states/openstack_ha | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml (limited to 'mcp/config') diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml new file mode 100644 index 000000000..6e55038fc --- /dev/null +++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml @@ -0,0 +1,14 @@ +cluster: + domain: baremetal-mcp-ocata-ovs-dpdk-ha.local + states: + - maas + - dpdk + - openstack_ha + - networks +virtual: + nodes: + - cfg01 + - mas01 + mas01: + vcpus: 4 + ram: 16384 diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk index c6cd2a5a8..c4abbb100 100755 --- a/mcp/config/states/dpdk +++ b/mcp/config/states/dpdk @@ -3,7 +3,7 @@ set -x salt -I 'nova:compute' system.reboot while true; do salt -I 'nova:compute' test.ping | fgrep -q 'Not connected' || break; done -salt -I 'nova:compute' state.sls linux.network.dpdk +salt -I 'nova:compute' state.sls linux.network salt -I 'nova:compute' pkg.install libvirt-bin salt -I 'nova:compute' file.chown /var/run/openvswitch libvirt-qemu kvm diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 2597e82e3..507ca6124 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -38,7 +38,7 @@ salt -I 'cinder:controller' state.sls cinder -b 1 salt -I 'cinder:volume' state.sls cinder salt -I 'neutron:server' state.sls neutron -b 1 -salt -I 'neutron:gateway' state.sls neutron +salt -I 'neutron:gateway' state.sls neutron.gateway salt -I 'nova:compute' state.sls nova -- cgit