From 9972139f91debfe24c8cb3cfcdfbc595619659e2 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 8 Mar 2018 22:07:19 +0100 Subject: Fix missing root_helper_daemon for cmp, gtw While at it, drop patch now upstream. JIRA: FUEL-348 Fixes: cf6cd9cd Change-Id: Ieb4c93e9dc79a4e4dec140433574e042a1a6f2dc Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 1 + mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml | 1 + mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml | 1 + 3 files changed, 3 insertions(+) (limited to 'mcp/reclass/classes') 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 -- cgit 1.2.3-korg