aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-22 19:39:42 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-22 19:40:17 +0100
commitbb3b6968dbccb74959d394fb6426ba5b8fb2c5e3 (patch)
tree8e7d93147cd60787eb5a2732203c9cac66c3f5e4
parent9308f98d759e4f934b4fa11533e4cec6da36cd3c (diff)
[baremetal] Fix ocata reference
Previous cherry-pick failed to rename 'ocata' to 'pike'. JIRA: FUEL-317 Change-Id: Ic1a1145e0652f2a7d15980399232631cf3fc5080 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/lab_proxy_pdf.yml.j2)0
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml2
3 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml
index 1603201b8..4d7fa1eb1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-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.baremetal-mcp-ocata-common-ha.infra.lab_proxy_pdf
+ - cluster.baremetal-mcp-pike-common-ha.infra.lab_proxy_pdf
parameters:
_param:
salt_master_base_environment: prd
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2
index 0e95d2d1d..0e95d2d1d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/lab_proxy_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
index 76b473783..da28abf06 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
@@ -9,7 +9,7 @@
classes:
- system.maas.region.single
- service.maas.cluster.single
- - cluster.baremetal-mcp-ocata-common-ha.infra.lab_proxy_pdf
+ - cluster.baremetal-mcp-pike-common-ha.infra.lab_proxy_pdf
parameters:
_param:
dhcp_interface: ${_param:opnfv_fn_vm_primary_interface}