Fix keepalived vip interface mapping
PROD-14939
Change-Id: I0b69afcacff1ee60fb74b457ad5e3c0ea99118f1
diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
index 736b251..1a3fb61 100644
--- a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
@@ -94,18 +94,18 @@
- cluster.drivetrain-ha-clusters.cicd
parameters:
_param:
- cluster_name: cicd-lab-dev
- cluster_node01_name: ci01
+ cluster_name: drivetrain-ha-clusters
+ cluster_node01_name: cid01
cluster_node01_address: ${_param:control_node01_address}
- cluster_node02_name: ci02
+ cluster_node02_name: cid02
cluster_node02_address: ${_param:control_node02_address}
- cluster_node03_name: ci03
+ cluster_node03_name: cid03
cluster_node03_address: ${_param:control_node03_address}
keepalived_vip_virtual_router_id: 180
keepalived_vip_priority: 103
keepalived_vip_password: password
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ens4
cluster_vip_address: ${_param:control_vip_address}
cluster_public_host: ${_param:control_public_host}
diff --git a/classes/cluster/drivetrain-ha-clusters/infra/config.yml b/classes/cluster/drivetrain-ha-clusters/infra/config.yml
index a96d9fe..b89f6ba 100644
--- a/classes/cluster/drivetrain-ha-clusters/infra/config.yml
+++ b/classes/cluster/drivetrain-ha-clusters/infra/config.yml
@@ -6,18 +6,6 @@
- system.sphinx.server.doc.reclass
- cluster.drivetrain-ha-clusters
parameters:
- _param:
- reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
- reclass_data_revision: master
- reclass_config_master: ${_param:infra_config_deploy_address}
- single_address: ${_param:infra_config_address}
- linux_system_codename: xenial
- salt_master_base_environment: prd
- salt_minion_ca_host: ${linux:network:fqdn}
- salt_master_host: ${_param:infra_config_deploy_address}
- cluster_public_host: ${_param:infra_config_address}
- salt_api_password: hovno12345!
- salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
salt:
master:
order_masters: true
@@ -76,9 +64,7 @@
name: ${_param:cicd_control_node01_hostname}
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.infra.config
- cluster.${_param:cluster_name}.cicd.control.master
- - cluster.overrides
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
@@ -89,7 +75,6 @@
domain: ${_param:cluster_domain}
classes:
- cluster.${_param:cluster_name}.cicd.control.slave
- - cluster.overrides
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
@@ -101,7 +86,6 @@
domain: ${_param:cluster_domain}
classes:
- cluster.${_param:cluster_name}.cicd.control.slave
- - cluster.overrides
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
diff --git a/classes/cluster/drivetrain-ha-clusters/infra/init.yml b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
index d385985..3a75d48 100644
--- a/classes/cluster/drivetrain-ha-clusters/infra/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
@@ -2,6 +2,7 @@
_param:
cluster_domain: drivetrain-ha-clusters.local
cluster_name: drivetrain-ha-clusters
+ linux_system_codename: xenial
apt_mk_version: nightly
admin_email: root@localhosti
infra_config_hostname: cfg01
@@ -9,6 +10,16 @@
infra_config_deploy_address: 192.168.10.90
salt_minion_ca_host: ci01.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ salt_master_base_environment: prd
+ salt_minion_ca_host: ${linux:network:fqdn}
+ salt_master_host: ${_param:infra_config_deploy_address}
+ salt_api_password: hovno12345!
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
+ reclass_data_revision: master
+ reclass_config_master: ${_param:infra_config_deploy_address}
+ cluster_public_host: ${_param:infra_config_address}
+ single_address: ${_param:infra_config_address}
linux:
network:
host: