commit 80a2d73a04322dcdb79c96a65bc869fce7f9c748
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Sep 25 15:04:09 2019 +0000
committer Gerrit Code Review <mail@domain.com> Wed Sep 25 15:04:09 2019 +0000
tree d8abfe92d0cd167a1ad1ec8685400f4453539443
parent 0407fe8caf88da7b0f4dde62f4b74a69387803fc
parent adcd2c54f217062a38ca70d30f70cf4277e12bd7

Merge "Unhardcoding salt master name from cluster model." into release/proposed/2019.2.0

cassandra/backup/client/single.yml

diff --git a/cassandra/backup/client/single.yml b/cassandra/backup/client/single.yml
index 892f92f..0753740 100644
--- a/cassandra/backup/client/single.yml
+++ b/cassandra/backup/client/single.yml
@@ -2,8 +2,6 @@
 - service.cassandra.backup.client
 - system.openssh.client.root
 parameters:
-  _param:
-    cassandra_remote_backup_server: cfg01
   cassandra:
     backup:
       client:

defaults/backup.yml

diff --git a/defaults/backup.yml b/defaults/backup.yml
index 66e5173..76bed01 100644
--- a/defaults/backup.yml
+++ b/defaults/backup.yml
@@ -5,3 +5,6 @@
     backup_day_of_month: "*"
     backup_month: "*"
     backup_day_of_week: "*"
+    zookeeper_remote_backup_server: ${_param:infra_config_hostname}
+    cassandra_remote_backup_server: ${_param:infra_config_hostname}
+

defaults/init.yml

diff --git a/defaults/init.yml b/defaults/init.yml
index b7995d8..6c8684c 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -49,7 +49,7 @@
     # Other
     salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+    salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
     # Make sure this global variable is defined everywhere, where used it is already set on cluster level
     cluster_public_host: '127.0.0.1'
     single_address: '127.0.0.1'

zookeeper/backup/client/single.yml

diff --git a/zookeeper/backup/client/single.yml b/zookeeper/backup/client/single.yml
index d8eaaac..e1eac1b 100644
--- a/zookeeper/backup/client/single.yml
+++ b/zookeeper/backup/client/single.yml
@@ -2,8 +2,6 @@
 - service.zookeeper.backup.client
 - system.openssh.client.root
 parameters:
-  _param:
-    zookeeper_remote_backup_server: cfg01
   zookeeper:
     backup:
       client: