diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-07 08:15:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-07 08:15:00 +0000 |
| commit | b51c5f365f80cbad9f96d1c1c2c471a2d148414e (patch) | |
| tree | 596a9975a40d03e556f46b7b32dd8d9cd09ba948 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha | |
| parent | a9fbe3c47a680eded71680a4ee3b77b5e82af3c6 (diff) | |
| parent | fda7372a1bffe11fc7a199ad3d4344c1b9e57e57 (diff) | |
Merge "PDF: reclass: Rename template file suffix to _pdf"
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_init.yml.j2) | 0 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_init.yml.j2) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml index 39ced154b..035129dca 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml @@ -23,7 +23,7 @@ classes: # - system.salt.control.cluster.stacklight_server_cluster # - system.salt.control.cluster.stacklight_log_cluster # - system.salt.control.cluster.stacklight_telemetry_cluster - - cluster.baremetal-mcp-ocata-common-ha.infra.kvm_init + - cluster.baremetal-mcp-ocata-common-ha.infra.kvm_pdf parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_pdf.yml.j2 index d14f90582..d14f90582 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_init.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml index 47ef1f79f..ee36ece23 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml @@ -18,7 +18,7 @@ classes: - system.cinder.volume.single - system.cinder.volume.backend.lvm - system.ceilometer.agent.cluster - - cluster.baremetal-mcp-ocata-common-ha.openstack_compute_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_compute_pdf parameters: _param: cluster_vip_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.yml.j2 index 687777b2c..687777b2c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_init.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.yml.j2 |