From cf6cd9cd0e00ab1c1165f826a261476b3155268d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 7 Mar 2018 22:00:29 +0100 Subject: [IDF] net_config: Add support for custom ip-range - submodule: bump Pharos to pick up installer adapter support, as well as IDF updates for Ericsson baremetal pod1; - labs/local/virtual: Bump mgmt, public networks start addresses from .1 to .10, similar to ericsson-pod1; While at it, drop patch now upstream and instead adopt the new param 'neutron:server:root_helper_daemon'. JIRA: FUEL-351 Change-Id: I9bc244a7fd8698861a390ed2b6a27804be46c285 Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 1 + mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml | 1 + 2 files changed, 2 insertions(+) (limited to 'mcp/reclass') diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 index 1436828a5..c487e3424 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 @@ -134,6 +134,7 @@ parameters: neutron: server: vlan_aware_vms: true + root_helper_daemon: false keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml index 22d136acc..5c0cbe07f 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml @@ -125,3 +125,4 @@ parameters: neutron: server: vlan_aware_vms: true + root_helper_daemon: false -- cgit 1.2.3-korg