aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/config')
-rw-r--r--mcp/config/labs/local/idf-pod1.yaml12
-rw-r--r--mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml1
-rwxr-xr-xmcp/config/states/maas4
-rwxr-xr-xmcp/config/states/opendaylight1
4 files changed, 14 insertions, 4 deletions
diff --git a/mcp/config/labs/local/idf-pod1.yaml b/mcp/config/labs/local/idf-pod1.yaml
new file mode 100644
index 000000000..7932f8896
--- /dev/null
+++ b/mcp/config/labs/local/idf-pod1.yaml
@@ -0,0 +1,12 @@
+---
+### LF POD 2 installer descriptor file ###
+
+idf:
+ version: 0.1
+ fuel:
+ jumphost:
+ bridges:
+ admin: 'pxebr'
+ mgmt: 'br-ctl'
+ private: ''
+ public: ''
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
index f558f0a4b..6eb1e33ce 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
@@ -5,6 +5,7 @@ cluster:
- maas
- dpdk
- openstack_ha
+ - neutron_compute
- networks
virtual:
nodes:
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index aa17e9d4d..67ef6d559 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -117,7 +117,3 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp |
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
$(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
-
-# Get the latest packages for openstack nodes
-wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm).*' pkg.upgrade refresh=False | " \
- "tee /dev/stderr | fgrep -q 'Not connected'"
diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
index bee4c8586..e1ec1982f 100755
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight
@@ -3,4 +3,5 @@ set -x
salt -I 'opendaylight:server' state.sls opendaylight
salt -I 'opendaylight:client' state.sls opendaylight.client
+salt -I 'opendaylight:client' cmd.run 'neutron-odl-ovs-hostconfig --noovs_dpdk'
salt -I 'neutron:server' state.sls opendaylight.client