PDF: reclass: Rename template file suffix to _pdf

Init is a generic suffix which also collides with pre-existing files.
A distinct suffix (e.g. _pdf) should be used.

JIRA: FUEL-310

Change-Id: I919a5394e7ff432ee86d10bafe889aeadb181649
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore
index 37e4ad7..496fab9 100644 (file)
--- a/mcp/reclass/classes/cluster/.gitignore
+++ b/mcp/reclass/classes/cluster/.gitignore
@@ -1,4 +1 @@
-baremetal-mcp-*/infra/kvm_init.yml
-baremetal-mcp-*/openstack_compute_init.yml
-baremetal-mcp-*-ovs-dpdk-ha/infra/config_init.yml
-baremetal-mcp-*/openstack/compute_init.yml
+**/*_pdf.yml

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 39ced15..035129d 100644 (file)
--- 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
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_init.yml.j2
rename to 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 47ef1f7..ee36ece 100644 (file)
--- 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
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_init.yml.j2
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index 3c93972..cec60a8 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -9,7 +9,7 @@
 classes:
   - system.linux.system.repo.mcp.openstack
   - cluster.baremetal-mcp-ocata-common-ha.openstack_compute
-  - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_init
+  - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_pdf
   - cluster.baremetal-mcp-ocata-odl-ha.infra
   - system.neutron.gateway.opendaylight.single
 parameters:

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
index 4a7e4cd..2adc5bd 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
@@ -9,4 +9,4 @@
 classes:
   - cluster.baremetal-mcp-ocata-common-ha.infra.config
   - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
-  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config_init
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config_pdf

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_pdf.yml.j2
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml.j2
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
index 79f297f..9973075 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
@@ -8,7 +8,7 @@
 ---
 classes:
   - cluster.baremetal-mcp-ocata-common-ha.openstack_compute
-  - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_init
+  - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_pdf
   - cluster.baremetal-mcp-ocata-ovs-ha.infra
 parameters:
   nova:

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_init.yml.j2
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2