diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-20 15:57:08 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-20 15:59:13 +0200 |
| commit | dae5c2c5e677e4af8e56370c10316219a539321e (patch) | |
| tree | 8a40810b1b83f2215b030d13eff5f7bc35f8b63b /mcp/reclass/classes/cluster | |
| parent | 54ebfaf561693186580cacf259804f7968bec0fd (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/classes/cluster')
| -rw-r--r-- | mcp/reclass/classes/cluster/.gitignore | 4 |
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 |