Merge "Bump Grafana Docker image to 4.5.2"
diff --git a/classes/cluster/ceph-ha/ceph/init.yml b/classes/cluster/ceph-ha/ceph/init.yml
index 6bfb3db..a2600a9 100644
--- a/classes/cluster/ceph-ha/ceph/init.yml
+++ b/classes/cluster/ceph-ha/ceph/init.yml
@@ -22,6 +22,8 @@
ceph_cfs_node01_hostname: cfs01
ceph_cfs_node01_address: 172.16.10.97
+ single_address: ''
+
ceph_cluster_fsid: a619c5fc-c4ed-4f22-9ed2-66cf2feca23d
ceph_mon_keyring: AQAnQIhZ6in5KxAAdf467upoRMWFcVg5pbh1yg==
ceph_admin_keyring: AQBHPYhZv5mYDBAAvisaSzCTQkC5gywGUp/voA==
diff --git a/classes/cluster/ceph-ha/infra/config.yml b/classes/cluster/ceph-ha/infra/config.yml
index cc97968..2de9d4c 100644
--- a/classes/cluster/ceph-ha/infra/config.yml
+++ b/classes/cluster/ceph-ha/infra/config.yml
@@ -76,33 +76,48 @@
cluster_param:
ceph_osd_node01_address:
value_template: <<node_control_ip>>
+ single_address:
+ value_template: <<node_control_ip>>
ceph_osd_02:
expression: <<node_hostname>>__equals__osd1
cluster_param:
ceph_osd_node02_address:
value_template: <<node_control_ip>>
+ single_address:
+ value_template: <<node_control_ip>>
ceph_osd_03:
expression: <<node_hostname>>__equals__osd2
cluster_param:
ceph_osd_node03_address:
value_template: <<node_control_ip>>
+ single_address:
+ value_template: <<node_control_ip>>
ceph_mon_01:
expression: <<node_hostname>>__equals__cmn01
cluster_param:
ceph_mon_node01_address:
value_template: <<node_control_ip>>
+ single_address:
+ value_template: <<node_control_ip>>
ceph_mon_02:
expression: <<node_hostname>>__equals__cmn02
cluster_param:
ceph_mon_node02_address:
value_template: <<node_control_ip>>
+ single_address:
+ value_template: <<node_control_ip>>
ceph_mon_03:
expression: <<node_hostname>>__equals__cmn03
cluster_param:
ceph_mon_node03_address:
value_template: <<node_control_ip>>
+ single_address:
+ value_template: <<node_control_ip>>
ceph_cfs:
expression: <<node_hostname>>__startswith__cfs
node_class:
value_template:
- cluster.<<node_cluster>>.ceph.cfs
+ cluster_param:
+ single_address:
+ value_template: <<node_control_ip>>
diff --git a/classes/cluster/sl-os-ovs/infra/config.yml b/classes/cluster/sl-os-ovs/infra/config.yml
index 25cf3d8..00b4007 100644
--- a/classes/cluster/sl-os-ovs/infra/config.yml
+++ b/classes/cluster/sl-os-ovs/infra/config.yml
@@ -136,6 +136,7 @@
cluster_param:
stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
+ node:
prx_node:
name: ${_param:openstack_proxy_node01_hostname}
domain: ${_param:cluster_domain}
@@ -185,4 +186,3 @@
single_address: ${_param:stacklight_monitor_node03_address}
keepalived_vip_priority: 102
mysql_cluster_role: slave
-
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index 5e2071a..1694dd3 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -25,6 +25,8 @@
single_address: 172.16.10.90
infra_config_address: ${_param:single_address}
cluster_domain: virtual-mcp11-aio.local
+ cluster_name: virtual-mcp11-aio
+ infra_config_hostname: cfg01
mysql_admin_user: root
mysql_admin_password: workshop