summaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/config')
-rw-r--r--mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml2
-rwxr-xr-xmcp/config/states/dpdk9
2 files changed, 11 insertions, 0 deletions
diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
index ab882215b..540761cbf 100644
--- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
@@ -18,6 +18,8 @@ virtual:
gtw01:
ram: 2048
cmp01:
+ vcpus: 4
ram: 6144
cmp02:
+ vcpus: 4
ram: 6144
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index c4abbb100..c1ec07e27 100755
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -5,5 +5,14 @@ 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
+# switch to UCA repos since fuel-infra packages have bugs
+salt -I 'nova:compute' cmd.run 'rm -vrf /etc/apt/preferences.d/*'
+salt -I 'nova:compute' file.remove '/etc/apt/sources.list.d/mirantis_openstack.list'
+salt -I 'nova:compute' pkg.refresh_db
+
+salt -I 'nova:compute' pkg.install neutron-common
+salt -I 'nova:compute' file.append /etc/sudoers.d/neutron_sudoers \
+ args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf'
+
salt -I 'nova:compute' pkg.install libvirt-bin
salt -I 'nova:compute' file.chown /var/run/openvswitch libvirt-qemu kvm