diff --git a/hiera/globals/neut_gre.generate_vms.yaml b/hiera/globals/neut_gre.generate_vms.yaml index c4007b9..f46d35a 100644 --- a/hiera/globals/neut_gre.generate_vms.yaml +++ b/hiera/globals/neut_gre.generate_vms.yaml @@ -110,7 +110,7 @@ node_roles: - controller name: node-131 - ceph_primary_monitor_node_hash: {} + ceph_primary_monitor_node: {} ceph_rgw_nodes: *id001 ceilometer: alarm_history_time_to_live: "604800" diff --git a/hiera/globals/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml b/hiera/globals/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml index feba500..e7d10a8 100644 --- a/hiera/globals/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml +++ b/hiera/globals/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml @@ -83,7 +83,7 @@ node_roles: - primary-controller name: node-125 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-125: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml b/hiera/globals/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml index 7821e77..308442c 100644 --- a/hiera/globals/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml +++ b/hiera/globals/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml @@ -84,7 +84,7 @@ - primary-controller name: node-125 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-125: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan.ceph.compute-ephemeral-ceph.yaml b/hiera/globals/neut_vlan.ceph.compute-ephemeral-ceph.yaml index df15478..f0523bd 100644 --- a/hiera/globals/neut_vlan.ceph.compute-ephemeral-ceph.yaml +++ b/hiera/globals/neut_vlan.ceph.compute-ephemeral-ceph.yaml @@ -67,7 +67,7 @@ - ceph-osd - primary-controller name: node-1 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-1: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan.ceph.controller-ephemeral-ceph.yaml b/hiera/globals/neut_vlan.ceph.controller-ephemeral-ceph.yaml index fd5dc35..1300c18 100644 --- a/hiera/globals/neut_vlan.ceph.controller-ephemeral-ceph.yaml +++ b/hiera/globals/neut_vlan.ceph.controller-ephemeral-ceph.yaml @@ -68,7 +68,7 @@ - ceph-osd - primary-controller name: node-1 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-1: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan.cinder-block-device.compute.yaml b/hiera/globals/neut_vlan.cinder-block-device.compute.yaml index 656dfc3..ffe7b5c 100644 --- a/hiera/globals/neut_vlan.cinder-block-device.compute.yaml +++ b/hiera/globals/neut_vlan.cinder-block-device.compute.yaml @@ -111,7 +111,7 @@ node_roles: - controller name: node-3 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-1: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan.compute.nossl.yaml b/hiera/globals/neut_vlan.compute.nossl.yaml index c94caee..4803a12 100644 --- a/hiera/globals/neut_vlan.compute.nossl.yaml +++ b/hiera/globals/neut_vlan.compute.nossl.yaml @@ -153,7 +153,7 @@ - cinder - controller name: node-2 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-1: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan.compute.ssl.overridden.yaml b/hiera/globals/neut_vlan.compute.ssl.overridden.yaml index 91a003c..c5f6cb0 100644 --- a/hiera/globals/neut_vlan.compute.ssl.overridden.yaml +++ b/hiera/globals/neut_vlan.compute.ssl.overridden.yaml @@ -153,7 +153,7 @@ - cinder - controller name: node-2 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-1: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan.compute.ssl.yaml b/hiera/globals/neut_vlan.compute.ssl.yaml index 71c4172..3ef126d 100644 --- a/hiera/globals/neut_vlan.compute.ssl.yaml +++ b/hiera/globals/neut_vlan.compute.ssl.yaml @@ -153,7 +153,7 @@ - cinder - controller name: node-2 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-1: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan.ironic.conductor.yaml b/hiera/globals/neut_vlan.ironic.conductor.yaml index 7d2d906..e9f344c 100644 --- a/hiera/globals/neut_vlan.ironic.conductor.yaml +++ b/hiera/globals/neut_vlan.ironic.conductor.yaml @@ -68,7 +68,7 @@ node_roles: - primary-controller name: node-1 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-1: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan.ironic.controller.yaml b/hiera/globals/neut_vlan.ironic.controller.yaml index 6aaa17e..04d3e59 100644 --- a/hiera/globals/neut_vlan.ironic.controller.yaml +++ b/hiera/globals/neut_vlan.ironic.controller.yaml @@ -69,7 +69,7 @@ - primary-controller name: node-1 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-1: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml b/hiera/globals/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml index 0647fc0..46b92d8 100644 --- a/hiera/globals/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml +++ b/hiera/globals/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml @@ -83,7 +83,7 @@ node_roles: - primary-controller name: node-125 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-125: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan_l3ha.ceph.ceil-compute.yaml b/hiera/globals/neut_vlan_l3ha.ceph.ceil-compute.yaml index feba500..e7d10a8 100644 --- a/hiera/globals/neut_vlan_l3ha.ceph.ceil-compute.yaml +++ b/hiera/globals/neut_vlan_l3ha.ceph.ceil-compute.yaml @@ -83,7 +83,7 @@ node_roles: - primary-controller name: node-125 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-125: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan_l3ha.ceph.ceil-controller.yaml b/hiera/globals/neut_vlan_l3ha.ceph.ceil-controller.yaml index f300f69..575ee81 100644 --- a/hiera/globals/neut_vlan_l3ha.ceph.ceil-controller.yaml +++ b/hiera/globals/neut_vlan_l3ha.ceph.ceil-controller.yaml @@ -127,7 +127,7 @@ node_roles: - controller name: node-128 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-125: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml b/hiera/globals/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml index eddb6f1..4d4ac3c 100644 --- a/hiera/globals/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml +++ b/hiera/globals/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml @@ -127,7 +127,7 @@ node_roles: - controller name: node-128 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-125: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml b/hiera/globals/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml index 456b313..a1c58f9 100644 --- a/hiera/globals/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml +++ b/hiera/globals/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml @@ -83,7 +83,7 @@ node_roles: - primary-controller name: node-125 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-125: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vxlan_dvr.murano.sahara-cinder.yaml b/hiera/globals/neut_vxlan_dvr.murano.sahara-cinder.yaml index 02acfac..81ff0f3 100644 --- a/hiera/globals/neut_vxlan_dvr.murano.sahara-cinder.yaml +++ b/hiera/globals/neut_vxlan_dvr.murano.sahara-cinder.yaml @@ -153,7 +153,7 @@ node_roles: - controller name: node-131 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-128: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vxlan_dvr.murano.sahara-compute.yaml b/hiera/globals/neut_vxlan_dvr.murano.sahara-compute.yaml index 74a7f0e..cad9f16 100644 --- a/hiera/globals/neut_vxlan_dvr.murano.sahara-compute.yaml +++ b/hiera/globals/neut_vxlan_dvr.murano.sahara-compute.yaml @@ -153,7 +153,7 @@ node_roles: - controller name: node-131 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-128: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vxlan_dvr.murano.sahara-controller.yaml b/hiera/globals/neut_vxlan_dvr.murano.sahara-controller.yaml index 715ebc7..6d5f760 100644 --- a/hiera/globals/neut_vxlan_dvr.murano.sahara-controller.yaml +++ b/hiera/globals/neut_vxlan_dvr.murano.sahara-controller.yaml @@ -158,7 +158,7 @@ syslog_server: "10.108.0.2" ceph_tuning_settings: {} ceph_monitor_nodes: *id001 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-128: *id002 ceph_rgw_nodes: *id001 ceilometer: diff --git a/hiera/globals/neut_vxlan_dvr.murano.sahara-primary-controller.overridden_ssl.yaml b/hiera/globals/neut_vxlan_dvr.murano.sahara-primary-controller.overridden_ssl.yaml index 3a2c56b..af8aae5 100644 --- a/hiera/globals/neut_vxlan_dvr.murano.sahara-primary-controller.overridden_ssl.yaml +++ b/hiera/globals/neut_vxlan_dvr.murano.sahara-primary-controller.overridden_ssl.yaml @@ -157,7 +157,7 @@ node_roles: - controller name: node-131 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-128: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vxlan_dvr.murano.sahara-primary-controller.yaml b/hiera/globals/neut_vxlan_dvr.murano.sahara-primary-controller.yaml index bad459f..843e20e 100644 --- a/hiera/globals/neut_vxlan_dvr.murano.sahara-primary-controller.yaml +++ b/hiera/globals/neut_vxlan_dvr.murano.sahara-primary-controller.yaml @@ -157,7 +157,7 @@ node_roles: - controller name: node-131 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-128: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vxlan_dvr.sahara-cinder.yaml b/hiera/globals/neut_vxlan_dvr.sahara-cinder.yaml index 675e250..d4a9d9e 100644 --- a/hiera/globals/neut_vxlan_dvr.sahara-cinder.yaml +++ b/hiera/globals/neut_vxlan_dvr.sahara-cinder.yaml @@ -147,7 +147,7 @@ node_roles: - controller name: node-131 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-128: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vxlan_dvr.sahara-compute.yaml b/hiera/globals/neut_vxlan_dvr.sahara-compute.yaml index 889efa5..71cdbf1 100644 --- a/hiera/globals/neut_vxlan_dvr.sahara-compute.yaml +++ b/hiera/globals/neut_vxlan_dvr.sahara-compute.yaml @@ -147,7 +147,7 @@ node_roles: - controller name: node-131 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-128: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vxlan_dvr.sahara-controller.yaml b/hiera/globals/neut_vxlan_dvr.sahara-controller.yaml index 612ad18..9bc0dc5 100644 --- a/hiera/globals/neut_vxlan_dvr.sahara-controller.yaml +++ b/hiera/globals/neut_vxlan_dvr.sahara-controller.yaml @@ -148,7 +148,7 @@ node_roles: - controller name: node-131 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-128: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vxlan_dvr.sahara-primary-controller.overridden_ssl.yaml b/hiera/globals/neut_vxlan_dvr.sahara-primary-controller.overridden_ssl.yaml index 5c10a7c..200beef 100644 --- a/hiera/globals/neut_vxlan_dvr.sahara-primary-controller.overridden_ssl.yaml +++ b/hiera/globals/neut_vxlan_dvr.sahara-primary-controller.overridden_ssl.yaml @@ -148,7 +148,7 @@ node_roles: - controller name: node-131 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-128: *id001 ceph_rgw_nodes: *id002 ceilometer: diff --git a/hiera/globals/neut_vxlan_dvr.sahara-primary-controller.yaml b/hiera/globals/neut_vxlan_dvr.sahara-primary-controller.yaml index befe3d9..921e44e 100644 --- a/hiera/globals/neut_vxlan_dvr.sahara-primary-controller.yaml +++ b/hiera/globals/neut_vxlan_dvr.sahara-primary-controller.yaml @@ -148,7 +148,7 @@ node_roles: - controller name: node-131 - ceph_primary_monitor_node_hash: + ceph_primary_monitor_node: node-128: *id001 ceph_rgw_nodes: *id002 ceilometer: