Remove hiera interpolation from ceph-ansible parameters
We can't interpolate hiera parameters when setting values for the ceph-ansible parameters. Change-Id: I647497a593acd8628a2b0f439d8b5380ba8705aa
This commit is contained in:
parent
0da17202ec
commit
3acf7e4cfd
@ -231,15 +231,7 @@ outputs:
|
|||||||
ceph_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]}
|
ceph_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]}
|
||||||
containerized_deployment: true
|
containerized_deployment: true
|
||||||
public_network: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephMonNetwork]}]}
|
public_network: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephMonNetwork]}]}
|
||||||
monitor_address_block:
|
monitor_address_block: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephMonNetwork]}]}
|
||||||
get_param:
|
|
||||||
- ServiceData
|
|
||||||
- net_cidr_map
|
|
||||||
- str_replace:
|
|
||||||
template:
|
|
||||||
"%{hiera('$NETWORK')}"
|
|
||||||
params:
|
|
||||||
$NETWORK: {get_param: [ServiceNetMap, CephMonNetwork]}
|
|
||||||
cluster_network: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
|
cluster_network: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
|
||||||
user_config: true
|
user_config: true
|
||||||
ceph_stable: true
|
ceph_stable: true
|
||||||
|
@ -72,15 +72,7 @@ outputs:
|
|||||||
- {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
|
- {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
|
||||||
- radosgw_keystone: true
|
- radosgw_keystone: true
|
||||||
radosgw_keystone_ssl: false
|
radosgw_keystone_ssl: false
|
||||||
radosgw_address_block:
|
radosgw_address_block: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephRgwNetwork]}]}
|
||||||
get_param:
|
|
||||||
- ServiceData
|
|
||||||
- net_cidr_map
|
|
||||||
- str_replace:
|
|
||||||
template:
|
|
||||||
"%{hiera('$NETWORK')}"
|
|
||||||
params:
|
|
||||||
$NETWORK: {get_param: [ServiceNetMap, CephRgwNetwork]}
|
|
||||||
radosgw_civetweb_port: {get_param: [EndpointMap, CephRgwInternal, port]}
|
radosgw_civetweb_port: {get_param: [EndpointMap, CephRgwInternal, port]}
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
keystone:
|
keystone:
|
||||||
|
Loading…
Reference in New Issue
Block a user