From dae5c2c5e677e4af8e56370c10316219a539321e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 20 Sep 2018 15:57:08 +0200 Subject: [infra] Bind mas01 mcpcontrol DHCP to MAAS_IP Bring back MAAS_IP global env var and use it for mas01 VM IP addr in mcpcontrol network to prevent salt minion signature change. Partially-reverts: b666bc50 Change-Id: I5c7668393fe66287bd3ecdc75dd3195d5a89a8f3 Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/.gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mcp/reclass/classes/cluster') diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore index 9266b7cbc..0179ad987 100644 --- a/mcp/reclass/classes/cluster/.gitignore +++ b/mcp/reclass/classes/cluster/.gitignore @@ -6,7 +6,7 @@ mcp-common-ha/infra/init.yml all-mcp-arch-common/infra/maas.yml mcp-common-ha/infra/kvm_novcp.yml all-mcp-arch-common/opnfv/maas_proxy.yml -mcp-common-ha/openstack_control.yml +mcp-common-*/openstack_control.yml mcp-common-ha/openstack_telemetry.yml mcp*common-*/openstack_init.yml mcp-common-ha/openstack_interface_vcp_biport.yml @@ -15,7 +15,7 @@ mcp-common-ha/openstack_proxy.yml mcp-*-ha/infra/kvm.yml mcp-*-ha/infra/init_vcp.yml mcp-odl-ha/infra/maas.yml -mcp-odl-ha/opendaylight/control.yml +mcp-odl-*/opendaylight/control.yml mcp-odl-ha/openstack/init.yml mcp-odl-noha/infra/config.yml mcp-*-noha/openstack/compute.yml -- cgit 1.2.3-korg