aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-26 13:21:23 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-26 13:37:51 +0400
commitc76d5e92d9e6cdfc614be4a1ed7b9e630c711008 (patch)
tree8af575318ff6dc85db790b3fd3695af7800292d7 /mcp/config
parentec3604c1a30981ad7e9d3a9ea82f61391c1266cf (diff)
[virtual] Switch compute nodes to uca repo
Test of snaps_health_check gets console output of instance, which is empty (https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1667033), therefore take affected packages of computes from UCA repo. Change-Id: I4e13a40dd47caf305efd9f393b3c3cf5a17ef312 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/config')
-rwxr-xr-xmcp/config/states/dpdk4
-rwxr-xr-xmcp/config/states/neutron_compute2
2 files changed, 2 insertions, 4 deletions
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index ad435630c..9eba5c083 100755
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -10,9 +10,5 @@ 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
diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute
index d58162100..6266b0f18 100755
--- a/mcp/config/states/neutron_compute
+++ b/mcp/config/states/neutron_compute
@@ -2,3 +2,5 @@
set -x
salt -I 'neutron:compute' state.sls neutron
+salt -I 'neutron:compute' file.append /etc/sudoers.d/neutron_sudoers \
+ args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf'