Replaced underscores with hyphens in cluster names and domains
Change-Id: I90d163602a0915b23f25f9f4d799799c0336e664
diff --git a/classes/cluster/ceph-ha/infra/init.yml b/classes/cluster/ceph-ha/infra/init.yml
index c4c7d0b..41a4387 100644
--- a/classes/cluster/ceph-ha/infra/init.yml
+++ b/classes/cluster/ceph-ha/infra/init.yml
@@ -17,7 +17,7 @@
# infra_config_deploy_address: 192.168.10.90
cluster_domain: ceph-ha.local
- cluster_name: ceph_ha
+ cluster_name: ceph-ha
apt_mk_version: nightly
primary_interface: ens3
linux:
diff --git a/classes/cluster/drivetrain-ha-clusters/infra/init.yml b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
index 583ce76..c5a0164 100644
--- a/classes/cluster/drivetrain-ha-clusters/infra/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
@@ -11,7 +11,7 @@
parameters:
_param:
cluster_domain: drivetrain-ha-clusters.local
- cluster_name: drivetrain_ha_clusters
+ cluster_name: drivetrain-ha-clusters
apt_mk_version: nightly
admin_email: root@localhosti
infra_config_hostname: cfg01
diff --git a/classes/cluster/drivetrain-ha/infra/init.yml b/classes/cluster/drivetrain-ha/infra/init.yml
index 868221e..f3fe176 100644
--- a/classes/cluster/drivetrain-ha/infra/init.yml
+++ b/classes/cluster/drivetrain-ha/infra/init.yml
@@ -11,7 +11,7 @@
parameters:
_param:
cluster_domain: drivetrain-ha.local
- cluster_name: drivetrain_ha
+ cluster_name: drivetrain-ha
apt_mk_version: nightly
infra_config_hostname: cid01
infra_config_address: 172.16.10.100
diff --git a/classes/cluster/k8s-aio-contrail/infra/init.yml b/classes/cluster/k8s-aio-contrail/infra/init.yml
index d10b0d4..ec7c359 100644
--- a/classes/cluster/k8s-aio-contrail/infra/init.yml
+++ b/classes/cluster/k8s-aio-contrail/infra/init.yml
@@ -16,7 +16,7 @@
infra_config_deploy_address: 192.168.10.90
cluster_domain: k8s-aio-contrail.local
- cluster_name: k8s_aio_contrail
+ cluster_name: k8s-aio-contrail
apt_mk_version: nightly
linux:
network:
diff --git a/classes/cluster/k8s-ha-contrail/infra/init.yml b/classes/cluster/k8s-ha-contrail/infra/init.yml
index 7cb36c7..5fbbbea 100644
--- a/classes/cluster/k8s-ha-contrail/infra/init.yml
+++ b/classes/cluster/k8s-ha-contrail/infra/init.yml
@@ -10,7 +10,7 @@
infra_config_deploy_address: 192.168.10.90
cluster_domain: k8s-ha-contrail.local
- cluster_name: k8s_ha_contrail
+ cluster_name: k8s-ha-contrail
apt_mk_version: nightly
linux:
network:
diff --git a/classes/cluster/model-manager/infra/init.yml b/classes/cluster/model-manager/infra/init.yml
index 697d92d..6b24a1d 100644
--- a/classes/cluster/model-manager/infra/init.yml
+++ b/classes/cluster/model-manager/infra/init.yml
@@ -1,7 +1,7 @@
parameters:
_param:
cluster_domain: model-manager.local
- cluster_name: model_manager
+ cluster_name: model-manager
infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.100
cluster_public_host: mm.mcp.mirantis.net
diff --git a/classes/cluster/os-aio-contrail/infra/init.yml b/classes/cluster/os-aio-contrail/infra/init.yml
index 0900cb4..1050967 100755
--- a/classes/cluster/os-aio-contrail/infra/init.yml
+++ b/classes/cluster/os-aio-contrail/infra/init.yml
@@ -1,7 +1,7 @@
parameters:
_param:
cluster_domain: os-aio-contrail.local
- cluster_name: os_aio_contrail
+ cluster_name: os-aio-contrail
infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.90
infra_config_hostname: cfg01
diff --git a/classes/cluster/os-aio-ovs/infra/init.yml b/classes/cluster/os-aio-ovs/infra/init.yml
index 03846c3..d5609e1 100644
--- a/classes/cluster/os-aio-ovs/infra/init.yml
+++ b/classes/cluster/os-aio-ovs/infra/init.yml
@@ -1,7 +1,7 @@
parameters:
_param:
cluster_domain: os-aio-ovs.local
- cluster_name: os_aio_ovs
+ cluster_name: os-aio-ovs
infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.90
linux:
diff --git a/classes/cluster/os-ha-contrail-40/infra/init.yml b/classes/cluster/os-ha-contrail-40/infra/init.yml
index c9958c7..520a622 100644
--- a/classes/cluster/os-ha-contrail-40/infra/init.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/init.yml
@@ -1,7 +1,7 @@
parameters:
_param:
- cluster_domain: os_ha_contrail_40.local
- cluster_name: os_ha_contrail_40
+ cluster_domain: os-ha-contrail-40.local
+ cluster_name: os-ha-contrail-40
infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
diff --git a/classes/cluster/os-ha-contrail/infra/init.yml b/classes/cluster/os-ha-contrail/infra/init.yml
index 8567b96..487df62 100755
--- a/classes/cluster/os-ha-contrail/infra/init.yml
+++ b/classes/cluster/os-ha-contrail/infra/init.yml
@@ -1,7 +1,7 @@
parameters:
_param:
cluster_domain: os-ha-contrail.local
- cluster_name: os_ha_contrail
+ cluster_name: os-ha-contrail
infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
diff --git a/classes/cluster/os-ha-ovs-syndic/infra/init.yml b/classes/cluster/os-ha-ovs-syndic/infra/init.yml
index 90af472..b3dd013 100644
--- a/classes/cluster/os-ha-ovs-syndic/infra/init.yml
+++ b/classes/cluster/os-ha-ovs-syndic/infra/init.yml
@@ -1,7 +1,7 @@
parameters:
_param:
cluster_domain: os-ha-ovs-syndic.local
- cluster_name: os_ha_ovs_syndic
+ cluster_name: os-ha-ovs-syndic
infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.90
salt_syndic_master_address: 192.168.10.90
diff --git a/classes/cluster/os-ha-ovs/infra/init.yml b/classes/cluster/os-ha-ovs/infra/init.yml
index b035577..b8555b0 100644
--- a/classes/cluster/os-ha-ovs/infra/init.yml
+++ b/classes/cluster/os-ha-ovs/infra/init.yml
@@ -1,7 +1,7 @@
parameters:
_param:
cluster_domain: os-ha-ovs.local
- cluster_name: os_ha_ovs
+ cluster_name: os-ha-ovs
infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.90
linux:
diff --git a/classes/cluster/sl-k8s-contrail/infra/init.yml b/classes/cluster/sl-k8s-contrail/infra/init.yml
index 9e7f58d..0b58654 100644
--- a/classes/cluster/sl-k8s-contrail/infra/init.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/init.yml
@@ -11,7 +11,7 @@
infra_config_deploy_address: 192.168.10.90
cluster_domain: sl-k8s-contrail.local
- cluster_name: sl_k8s_contrail
+ cluster_name: sl-k8s-contrail
apt_mk_version: nightly
linux:
network:
diff --git a/classes/cluster/sl-os-contrail/infra/init.yml b/classes/cluster/sl-os-contrail/infra/init.yml
index 2590737..a812065 100755
--- a/classes/cluster/sl-os-contrail/infra/init.yml
+++ b/classes/cluster/sl-os-contrail/infra/init.yml
@@ -1,7 +1,7 @@
parameters:
_param:
cluster_domain: sl-os-contrail.local
- cluster_name: sl_os_contrail
+ cluster_name: sl-os-contrail
infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
diff --git a/classes/cluster/sl-os-ovs/infra/init.yml b/classes/cluster/sl-os-ovs/infra/init.yml
index a482086..b774ff8 100644
--- a/classes/cluster/sl-os-ovs/infra/init.yml
+++ b/classes/cluster/sl-os-ovs/infra/init.yml
@@ -1,7 +1,7 @@
parameters:
_param:
cluster_domain: sl-os-ovs.local
- cluster_name: sl_os_ovs
+ cluster_name: sl-os-ovs
infra_config_deploy_address: 192.168.10.90
infra_config_address: 172.16.10.100
linux: