diff options
5 files changed, 3 insertions, 33 deletions
diff --git a/mcp/patches/0001-pike-neutron.server.conf.Debian-Fix-undefined-var.patch b/mcp/patches/0001-pike-neutron.server.conf.Debian-Fix-undefined-var.patch deleted file mode 100644 index d1f7b40ff..000000000 --- a/mcp/patches/0001-pike-neutron.server.conf.Debian-Fix-undefined-var.patch +++ /dev/null @@ -1,32 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Wed, 7 Mar 2018 23:44:32 +0100 -Subject: [PATCH] pike/neutron.server.conf.Debian: Fix undefined var - -Fixes: 1ff8865b - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - neutron/files/pike/neutron-server.conf.Debian | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/neutron/files/pike/neutron-server.conf.Debian b/neutron/files/pike/neutron-server.conf.Debian -index 94443cf..cc75da5 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) --{%- if neutron.root_helper_daemon|default(True) %} -+{%- if server.root_helper_daemon|default(True) %} - root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf - {%- else %} - #root_helper_daemon = <None> diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index efe38218e..e0ad1f704 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -5,7 +5,6 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -/usr/share/salt-formulas/env: 0001-pike-neutron.server.conf.Debian-Fix-undefined-var.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-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml index bae1c1c6d..741f9d350 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml @@ -65,6 +65,7 @@ parameters: neutron: gateway: vlan_aware_vms: true + root_helper_daemon: false nova: compute: disk_cachemodes: file=directsync,block=none diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml index 61ba1ac79..228ffdc36 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml @@ -35,6 +35,7 @@ parameters: compute: notification: true vlan_aware_vms: true + root_helper_daemon: false agent_mode: ${_param:neutron_compute_agent_mode} message_queue: host: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml index 918ab2f2e..8061bb1fe 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml @@ -17,3 +17,4 @@ parameters: notification: true agent_mode: ${_param:neutron_gateway_agent_mode} vlan_aware_vms: true + root_helper_daemon: false |