diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-06 12:18:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-06 12:18:57 +0000 |
| commit | fd76fb23ba74443387c2d6d64120ac974836b085 (patch) | |
| tree | 28dc977987ea8f5a5bb82a34c33ce432effecb3e /puppet | |
| parent | a1e48373350c6f99a302d9d051d632f97794ad70 (diff) | |
| parent | 039483d09923a34a5423c39d0f206afa4802ea27 (diff) | |
Merge "ec2-api: Get FQDN from hiera instead of puppet fact"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/ec2-api.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml index 70821396..10f6d311 100644 --- a/puppet/services/ec2-api.yaml +++ b/puppet/services/ec2-api.yaml @@ -72,13 +72,13 @@ outputs: ec2api::api::ec2api_listen: str_replace: template: - '"%{::fqdn_$NETWORK}"' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, Ec2ApiNetwork]} ec2api::metadata::metadata_listen: str_replace: template: - '"%{::fqdn_$NETWORK}"' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, Ec2ApiMetadataNetwork]} ec2api::db::database_connection: |