diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-24 12:10:08 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-24 13:20:55 +0000 |
| commit | 307beb5c9a5ef1d5e202c078e3daed3e47d1a645 (patch) | |
| tree | c18dc2c651f0c09398daa6d819cc92d9c435ccc6 /mcp/config | |
| parent | abf9b9a8363e308daaaf297450222cf8c5397868 (diff) | |
Switch nofeature-ha compute nodes to UCA repo
Employ UCA repo on computes nodes for nosdn-nofeature-ha scenario as
well to prevent a regression (creation of ports failed for 1+n instances)
of neutron ovs agent from mcp/openstack repos.
Change-Id: Ie65ae122096c0d3a93c09d46191787a934bd7d4f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 8ba3a1a4ed0ce41a76fa6d712778904bb56b60ac)
Diffstat (limited to 'mcp/config')
| -rw-r--r-- | mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml | 1 | ||||
| -rwxr-xr-x | mcp/config/states/neutron_compute | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml index 0d47682c1..1766f9700 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml @@ -13,7 +13,6 @@ cluster: - virtual_control_plane - dpdk - openstack_ha - - neutron_compute - networks virtual: nodes: diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute index f1285479e..c6b90e20d 100755 --- a/mcp/config/states/neutron_compute +++ b/mcp/config/states/neutron_compute @@ -9,6 +9,4 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x -salt -I 'neutron:compute' state.sls neutron || true -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' +salt -I 'neutron:compute' state.sls neutron |