diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-08 22:07:19 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-08 22:10:06 +0100 |
commit | 9972139f91debfe24c8cb3cfcdfbc595619659e2 (patch) | |
tree | 684b6c8f0dc20204a1f96cadcae24c2674290b3f /mcp/reclass/classes/cluster/mcp-pike-common-noha | |
parent | 21f34dab9380f98622c0075fa8f4b5868916a27f (diff) |
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-noha')
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml | 1 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml | 1 |
2 files changed, 2 insertions, 0 deletions
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 |