summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-20 15:57:08 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-21 19:53:36 +0200
commit6a997a36d07d9a3256139e3faea057ac54ddafd4 (patch)
treeb23fc31cd3f38f17cab187ba0ea641679fc44706 /mcp/reclass
parentd1e056ba8f3f848e267b460c827fe5c01f3fbc54 (diff)
[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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/.gitignore4
1 files changed, 2 insertions, 2 deletions
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