8 files changed, 44 insertions, 0 deletions
diff --git a/mcp/config/os-nosdn-nofeature-noha.yaml b/mcp/config/os-nosdn-nofeature-noha.yaml
index 526ea5763..7208d89f2 100644
--- a/mcp/config/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/os-nosdn-nofeature-noha.yaml
@@ -1,5 +1,9 @@
 cluster:
   domain: virtual-mcp-ocata-ovs.local
+  states:
+    - openstack
+    - neutron_compute
+    - networks
 virtual:
   nodes:
     - cfg01
diff --git a/mcp/config/os-nosdn-ovs-noha.yaml b/mcp/config/os-nosdn-ovs-noha.yaml
index ef35d72d3..ab882215b 100644
--- a/mcp/config/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/os-nosdn-ovs-noha.yaml
@@ -1,5 +1,10 @@
 cluster:
   domain: virtual-mcp-ocata-ovs-dpdk.local
+  states:
+    - dpdk
+    - openstack
+    - neutron_compute
+    - networks
 virtual:
   nodes:
     - cfg01
diff --git a/mcp/config/os-odl_l2-nofeature-noha.yaml b/mcp/config/os-odl_l2-nofeature-noha.yaml
index d9810791b..ef967320f 100644
--- a/mcp/config/os-odl_l2-nofeature-noha.yaml
+++ b/mcp/config/os-odl_l2-nofeature-noha.yaml
@@ -1,5 +1,9 @@
 cluster:
   domain: virtual-mcp-ocata-odl.local
+  states:
+    - opendaylight
+    - openstack
+    - networks
 virtual:
   nodes:
     - cfg01
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
new file mode 100755
index 000000000..3e8b22345
--- /dev/null
+++ b/mcp/config/states/dpdk
@@ -0,0 +1,4 @@
+salt -C 'I@nova:compute' system.reboot
+salt -C 'I@nova:compute' test.ping
+
+salt -C 'I@nova:compute' state.sls linux
diff --git a/mcp/config/states/networks b/mcp/config/states/networks
new file mode 100755
index 000000000..10f71c213
--- /dev/null
+++ b/mcp/config/states/networks
@@ -0,0 +1,3 @@
+salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume list"
+salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack network create --share --external --provider-network-type flat --provider-physical-network physnet1 floating_net"
+salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway 10.16.0.1 --no-dhcp --allocation-pool start=10.16.0.130,end=10.16.0.254 --network floating_net --subnet-range 10.16.0.0/24 floating_subnet"
diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute
new file mode 100755
index 000000000..e2ffec6be
--- /dev/null
+++ b/mcp/config/states/neutron_compute
@@ -0,0 +1 @@
+salt -I 'neutron:compute' state.sls neutron
diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
new file mode 100755
index 000000000..3b1cf7594
--- /dev/null
+++ b/mcp/config/states/opendaylight
@@ -0,0 +1,3 @@
+salt -I 'opendaylight:server' state.sls opendaylight
+salt -I 'opendaylight:client' state.sls opendaylight.client
+salt -I 'neutron:server' state.sls opendaylight.client
diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
new file mode 100755
index 000000000..3a15c2e51
--- /dev/null
+++ b/mcp/config/states/openstack
@@ -0,0 +1,20 @@
+salt -C 'I@rabbitmq:server' state.sls rabbitmq
+salt -C 'I@rabbitmq:server' cmd.run "rabbitmqctl status"
+
+salt -C 'I@mysql:server' state.sls mysql
+salt -C 'I@memcached:server' state.sls memcached
+
+salt -C 'I@keystone:server' state.sls keystone.server
+salt -C 'I@keystone:server' service.restart apache2
+salt -C 'I@keystone:server' state.sls keystone.client
+salt -C 'I@keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
+
+salt -C 'I@glance:server' state.sls glance
+salt -C 'I@nova:controller' state.sls nova
+salt -C 'I@heat:server' state.sls heat
+salt -C 'I@cinder:controller' state.sls cinder
+
+salt -C 'I@neutron:server' state.sls neutron
+salt -C 'I@neutron:gateway' state.sls neutron
+
+salt -C 'I@nova:compute' state.sls nova