diff options
Diffstat (limited to 'mcp/reclass/classes/cluster')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/include/lab_proxy_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2) | 0 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml (renamed from mcp/reclass/classes/cluster/mcp-pike-common-ha/include/proxy.yml) | 0 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml | 3 |
8 files changed, 10 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/lab_proxy_pdf.yml.j2 index 0e95d2d1d..0e95d2d1d 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/lab_proxy_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml index 3c324db8b..3c324db8b 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/proxy.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml index 0fb8e6418..5e416c907 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml @@ -25,7 +25,7 @@ classes: # - system.reclass.storage.system.stacklight_monitor_cluster # - system.reclass.storage.system.stacklight_telemetry_cluster - system.reclass.storage.system.infra_maas_single - - cluster.mcp-pike-common-ha.infra.lab_proxy_pdf + - cluster.mcp-pike-common-ha.include.lab_proxy_pdf parameters: _param: salt_master_base_environment: prd diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml index 9f85366c8..b6fb573e8 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml @@ -22,7 +22,8 @@ classes: # - system.salt.control.cluster.stacklight_log_cluster # - system.salt.control.cluster.stacklight_telemetry_cluster - cluster.mcp-pike-common-ha.infra.kvm_pdf - - cluster.mcp-pike-common-ha.include.proxy + - cluster.mcp-pike-common-ha.include.maas_proxy + - cluster.mcp-pike-common-ha.include.lab_proxy_pdf parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml index 3dc99983c..438915c1f 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml @@ -9,7 +9,7 @@ classes: - system.maas.region.single - service.maas.cluster.single - - cluster.mcp-pike-common-ha.infra.lab_proxy_pdf + - cluster.mcp-pike-common-ha.include.lab_proxy_pdf - cluster.mcp-pike-common-ha.infra.maas_pdf parameters: _param: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml index 2e79f808e..aed8bcb57 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml @@ -18,7 +18,8 @@ classes: - system.cinder.volume.backend.lvm - system.ceilometer.agent.cluster - cluster.mcp-pike-common-ha.openstack_compute_pdf - - cluster.mcp-pike-common-ha.include.proxy + - cluster.mcp-pike-common-ha.include.maas_proxy + - cluster.mcp-pike-common-ha.include.lab_proxy_pdf parameters: _param: cluster_vip_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml index 572aa7d25..1a3a8c112 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml @@ -7,7 +7,8 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.include.proxy + - cluster.mcp-pike-common-ha.include.maas_proxy + - cluster.mcp-pike-common-ha.include.lab_proxy_pdf parameters: _param: dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml index c1fd625bc..d274ecd87 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml @@ -7,7 +7,8 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.include.proxy + - cluster.mcp-pike-common-ha.include.maas_proxy + - cluster.mcp-pike-common-ha.include.lab_proxy_pdf parameters: _param: dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} |