diff options
Diffstat (limited to 'mcp')
4 files changed, 47 insertions, 1 deletions
diff --git a/mcp/patches/0001-Disable-root_helper_daemon-option.patch b/mcp/patches/0001-Disable-root_helper_daemon-option.patch new file mode 100644 index 000000000..389393975 --- /dev/null +++ b/mcp/patches/0001-Disable-root_helper_daemon-option.patch @@ -0,0 +1,40 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Michael Polenchuk <mpolenchuk@mirantis.com> +Date: Tue, 6 Mar 2018 16:15:57 +0400 +Subject: [PATCH] Disable root_helper_daemon option + +Change-Id: I4cc6cce4868ea95e806ce4b41069805fb995dcdb + +diff --git a/neutron/files/pike/neutron-generic.conf.Debian b/neutron/files/pike/neutron-generic.conf.Debian +index a94a24b..bec041f 100644 +--- a/neutron/files/pike/neutron-generic.conf.Debian ++++ b/neutron/files/pike/neutron-generic.conf.Debian +@@ -668,7 +668,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf + # needs to execute commands in Dom0 in the hypervisor of XenServer, this item + # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session + # to pass commands to Dom0. (string value) +-root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf ++#root_helper_daemon = <None> + + # Seconds between nodes reporting state to server; should be less than + # agent_down_time, best if it is half or less than agent_down_time. (floating +diff --git a/neutron/files/pike/neutron-server.conf.Debian b/neutron/files/pike/neutron-server.conf.Debian +index 2daaebf..c9554c8 100644 +--- a/neutron/files/pike/neutron-server.conf.Debian ++++ b/neutron/files/pike/neutron-server.conf.Debian +@@ -717,7 +717,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf + # needs to execute commands in Dom0 in the hypervisor of XenServer, this item + # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session + # to pass commands to Dom0. (string value) +-root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf ++#root_helper_daemon = <None> + + # Seconds between nodes reporting state to server; should be less than + # agent_down_time, best if it is half or less than agent_down_time. (floating diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index e0ad1f704..d1cd1b5b9 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -5,6 +5,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +/usr/share/salt-formulas/env: 0001-Disable-root_helper_daemon-option.patch /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch /usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch /usr/share/salt-formulas/env: 0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml index d1166b941..6c3e0d04c 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml @@ -7,10 +7,10 @@ ############################################################################## --- classes: + - service.neutron.gateway.opendaylight.single - cluster.mcp-pike-common-ha.openstack_compute - cluster.mcp-pike-odl-ha.openstack.compute_pdf - cluster.mcp-pike-odl-ha.infra - - service.neutron.gateway.opendaylight.single parameters: neutron: gateway: diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml index a6c8bc1df..c50f5b2cc 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml @@ -11,3 +11,8 @@ classes: - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - cluster.mcp-pike-common-ha.openstack_control - cluster.mcp-pike-odl-ha.infra +parameters: + neutron: + server: + backend: + enable_websocket: false |