openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use network-based fqdn entry from hiera instead of the custom fact"

Browse Source
This commit is contained in:
Jenkins 2016-12-02 09:40:36 +00:00 committed by Gerrit Code Review
commit 5aa0c861a4
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/services/aodh-api.yaml
View File

@ -55,7 +55,7 @@ outputs:
aodh::wsgi::apache::servername: aodh::wsgi::apache::servername:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
aodh::api::service_name: 'httpd' aodh::api::service_name: 'httpd'
@ -68,7 +68,7 @@ outputs:
aodh::api::host: aodh::api::host:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
# NOTE: bind IP is found in Heat replacing the network name with the # NOTE: bind IP is found in Heat replacing the network name with the

4
puppet/services/apache-internal-tls-certmonger.yaml
View File

@ -35,8 +35,8 @@ outputs:
httpd-NETWORK: httpd-NETWORK:
service_certificate: '/etc/pki/tls/certs/httpd-NETWORK.crt' service_certificate: '/etc/pki/tls/certs/httpd-NETWORK.crt'
service_key: '/etc/pki/tls/private/httpd-NETWORK.key' service_key: '/etc/pki/tls/private/httpd-NETWORK.key'
hostname: "%{::fqdn_NETWORK}" hostname: "%{hiera('fqdn_NETWORK')}"
principal: "HTTP/%{::fqdn_NETWORK}" principal: "HTTP/%{hiera('fqdn_NETWORK')}"
for_each: for_each:
NETWORK: NETWORK:
# NOTE(jaosorior) Get unique network names to create # NOTE(jaosorior) Get unique network names to create

2
puppet/services/barbican-api.yaml
View File

@ -93,7 +93,7 @@ outputs:
barbican::wsgi::apache::servername: barbican::wsgi::apache::servername:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, BarbicanApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, BarbicanApiNetwork]}
barbican::db::database_connection: barbican::db::database_connection:

4
puppet/services/ceilometer-api.yaml
View File

@ -75,7 +75,7 @@ outputs:
ceilometer::api::host: ceilometer::api::host:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
ceilometer::wsgi::apache::bind_host: {get_param: [ServiceNetMap, CeilometerApiNetwork]} ceilometer::wsgi::apache::bind_host: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
@ -83,7 +83,7 @@ outputs:
ceilometer::wsgi::apache::servername: ceilometer::wsgi::apache::servername:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
service_config_settings: service_config_settings:

4
puppet/services/cinder-api.yaml
View File

@ -101,7 +101,7 @@ outputs:
cinder::api::bind_host: cinder::api::bind_host:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
cinder::wsgi::apache::ssl: {get_param: EnableInternalTLS} cinder::wsgi::apache::ssl: {get_param: EnableInternalTLS}
@ -115,7 +115,7 @@ outputs:
cinder::wsgi::apache::servername: cinder::wsgi::apache::servername:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, CinderApiNetwork]}
- -

2
puppet/services/database/mysql.yaml
View File

@ -87,7 +87,7 @@ outputs:
tripleo::profile::base::database::mysql::bind_address: tripleo::profile::base::database::mysql::bind_address:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]} $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
step_config: | step_config: |

4
puppet/services/gnocchi-api.yaml
View File

@ -91,7 +91,7 @@ outputs:
gnocchi::wsgi::apache::servername: gnocchi::wsgi::apache::servername:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, GnocchiApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, GnocchiApiNetwork]}
tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend} tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
@ -105,7 +105,7 @@ outputs:
gnocchi::api::host: gnocchi::api::host:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, GnocchiApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, GnocchiApiNetwork]}

8
puppet/services/keystone.yaml
View File

@ -195,13 +195,13 @@ outputs:
keystone::wsgi::apache::servername: keystone::wsgi::apache::servername:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}
keystone::wsgi::apache::servername_admin: keystone::wsgi::apache::servername_admin:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}
keystone::wsgi::apache::workers: {get_param: KeystoneWorkers} keystone::wsgi::apache::workers: {get_param: KeystoneWorkers}
@ -219,13 +219,13 @@ outputs:
keystone::admin_bind_host: keystone::admin_bind_host:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}
keystone::public_bind_host: keystone::public_bind_host:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}
# NOTE: bind IP is found in Heat replacing the network name with the # NOTE: bind IP is found in Heat replacing the network name with the

4
puppet/services/nova-api.yaml
View File

@ -108,7 +108,7 @@ outputs:
nova::api::api_bind_address: nova::api::api_bind_address:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::service_name: 'httpd' nova::api::service_name: 'httpd'
@ -122,7 +122,7 @@ outputs:
nova::wsgi::apache::servername: nova::wsgi::apache::servername:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}

2
puppet/services/pacemaker/database/mysql.yaml
View File

@ -40,7 +40,7 @@ outputs:
- tripleo::profile::pacemaker::database::mysql::bind_address: - tripleo::profile::pacemaker::database::mysql::bind_address:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]} $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
# NOTE: bind IP is found in Heat replacing the network name with the # NOTE: bind IP is found in Heat replacing the network name with the

4
puppet/services/panko-api.yaml
View File

@ -55,7 +55,7 @@ outputs:
panko::wsgi::apache::servername: panko::wsgi::apache::servername:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, PankoApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, PankoApiNetwork]}
panko::api::service_name: 'httpd' panko::api::service_name: 'httpd'
@ -68,7 +68,7 @@ outputs:
panko::api::host: panko::api::host:
str_replace: str_replace:
template: template:
'%{::fqdn_$NETWORK}' "%{hiera('fqdn_$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, PankoApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, PankoApiNetwork]}
# NOTE: bind IP is found in Heat replacing the network name with the # NOTE: bind IP is found in Heat replacing the network name with the