drivetrain_ha model fixes - basic working setup
Change-Id: Ic825a7574debde9ee7959e90711aff4a1b27626e
diff --git a/classes/cluster/drivetrain_ha/bootstrap_vars b/classes/cluster/drivetrain_ha/bootstrap_vars
new file mode 100644
index 0000000..481bf83
--- /dev/null
+++ b/classes/cluster/drivetrain_ha/bootstrap_vars
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(glusterfs docker aptly keepalived rundeck)
diff --git a/classes/cluster/drivetrain_ha/cicd/control/init.yml b/classes/cluster/drivetrain_ha/cicd/control/init.yml
index 6fb78de..619db7b 100644
--- a/classes/cluster/drivetrain_ha/cicd/control/init.yml
+++ b/classes/cluster/drivetrain_ha/cicd/control/init.yml
@@ -90,7 +90,8 @@
# Rundeck
- system.rundeck.client.runbook
- - cluster.drivetrain_ha
+ # - cluster.drivetrain_ha.cicd
+ # - cluster.drivetrain_ha
parameters:
_param:
cluster_node01_name: ci01
diff --git a/classes/cluster/drivetrain_ha/cicd/init.yml b/classes/cluster/drivetrain_ha/cicd/init.yml
index 816b66f..9b736f2 100644
--- a/classes/cluster/drivetrain_ha/cicd/init.yml
+++ b/classes/cluster/drivetrain_ha/cicd/init.yml
@@ -1,6 +1,11 @@
parameters:
_param:
+ cluster_public_host: ${_param:cicd_control_address}
cicd_control_address: 172.16.10.254
+ cicd_control_hostname: cid
+ cicd_control_node01_hostname: cid01
+ cicd_control_node02_hostname: cid02
+ cicd_control_node03_hostname: cid03
cicd_control_node01_address: 172.16.10.11
cicd_control_node02_address: 172.16.10.12
cicd_control_node03_address: 172.16.10.13
diff --git a/classes/cluster/drivetrain_ha/infra/config.yml b/classes/cluster/drivetrain_ha/infra/config.yml
index fbad093..a536168 100644
--- a/classes/cluster/drivetrain_ha/infra/config.yml
+++ b/classes/cluster/drivetrain_ha/infra/config.yml
@@ -22,6 +22,12 @@
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
+ environment:
+ prd:
+ formula:
+ glusterfs:
+ source: pkg
+ name: salt-formula-glusterfs
linux:
network:
interface:
diff --git a/classes/cluster/drivetrain_ha/init.yml b/classes/cluster/drivetrain_ha/init.yml
index 1a37367..d80e58b 100644
--- a/classes/cluster/drivetrain_ha/init.yml
+++ b/classes/cluster/drivetrain_ha/init.yml
@@ -1,5 +1,6 @@
classes:
- cluster.drivetrain_ha.infra
- cluster.drivetrain_ha.cicd
+- cluster.drivetrain_ha.cicd.control
- cluster.overrides