fix model reactor variables
Change-Id: I8c809c291610a4fe8de0ffc7336fd3f736b1b6a9
diff --git a/classes/cluster/aaa-ha-freeipa/infra/config.yml b/classes/cluster/aaa-ha-freeipa/infra/config.yml
index e69242a..bd29e36 100644
--- a/classes/cluster/aaa-ha-freeipa/infra/config.yml
+++ b/classes/cluster/aaa-ha-freeipa/infra/config.yml
@@ -2,7 +2,7 @@
- system.linux.system.repo.ubuntu
- system.openssh.client.lab
- system.salt.master.single
-- system.salt.master.pkg
+- system.salt.master.git
- system.salt.minion.ca.salt_master
- system.salt.master.api
- system.mysql.client
@@ -13,7 +13,7 @@
- cluster.aaa-ha-freeipa
parameters:
_param:
- salt_master_base_environment: prd
+ salt_master_base_environment: dev
reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab.git"
reclass_data_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
@@ -22,10 +22,25 @@
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
salt_master_host: 127.0.0.1
salt:
+ #minion:
+ # source:
+ # engine: none
master:
+ #source:
+ # # TEMP: avoid to install salt packages (as we preinstall development version)
+ # engine: none
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
+ environment:
+ dev:
+ formula:
+ salt:
+ #source: pkg
+ #name: salt-formula-salt
+ source: git
+ address: 'https://github.com/epcim/salt-formula-salt.git'
+ revision: 'review/petr_michalec/allow-multiple-ext-pillars-and-reclass-options'
reclass:
storage:
@@ -34,7 +49,7 @@
expression: all
node_param:
single_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
linux_system_codename:
value_template: <<node_os>>
salt_master_host:
@@ -43,14 +58,14 @@
expression: <<node_hostname>>__startswith__cfg
cluster_param:
infra_config_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
infra_config_deploy_address:
- value_template: <<node_ip>>
+ value_template: <<node_deploy_ip>>
identity_control01:
expression: <<node_hostname>>__equals__idm01
cluster_param:
identity_control_node01_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
node_class:
value_template:
#- system.linux.system.repo.saltstack.rhel7
@@ -59,7 +74,7 @@
expression: <<node_hostname>>__equals__idm02
cluster_param:
identity_control_node02_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
node_class:
value_template:
#- system.linux.system.repo.saltstack.rhel7
@@ -68,7 +83,7 @@
expression: <<node_hostname>>__equals__idm03
cluster_param:
identity_control_node03_address:
- value_template: <<node_ip>>
+ value_template: <<node_control_ip>>
node_class:
value_template:
#- system.linux.system.repo.saltstack.rhel7