summaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-08 15:26:17 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-08 15:35:10 +0400
commit32b75cc293bf0402302ee674a0a0064456d219c7 (patch)
tree7dac7cdef19aaed3212b89c0f5b95937b5ee551a /mcp/config
parentac7bb381c5376c28b0eeac880af90b50a2801f38 (diff)
[ovs/dpdk] Mend dpdk settings
* add vcpus to virtual compute * re-pin dpdk core & pmds * switch to UCA repos * disable apt-daily cron job Change-Id: Ia23100b846d8954e3d5e8a264a6b8518402b2fa6 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
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