diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-23 23:53:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-23 23:53:23 +0000 |
| commit | a95e4c2afe614064f2ec8417f13b7b9719fc5e31 (patch) | |
| tree | 52407ebe04d773f2be12b0c453d2761adfbcfd8f /puppet/services | |
| parent | 59e3f2c696d05e83cf48aa359901cedac592d596 (diff) | |
| parent | 0d79742ec1279d1225b7e12fd509f2d734291324 (diff) | |
Merge "Set cinder::api::bind_host within service template"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/cinder-api.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/cinder-volume.yaml | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index 5ff99dd2..5df0739f 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -78,5 +78,11 @@ outputs: dport: - 8776 - 13776 + # NOTE: bind IP is found in Heat replacing the network name with the local node IP + # for the given network; replacement examples (eg. for internal_api): + # internal_api -> IP + # internal_api_uri -> [IP] + # internal_api_subnet - > IP/CIDR + cinder::api::bind_host: {get_param: [ServiceNetMap, CinderApiNetwork]} step_config: | include ::tripleo::profile::base::cinder::api diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml index 5dab466e..de7e6bab 100644 --- a/puppet/services/cinder-volume.yaml +++ b/puppet/services/cinder-volume.yaml @@ -90,5 +90,15 @@ outputs: tripleo.cinder_volume.firewall_rules: '120 iscsi initiator': dport: 3260 + # NOTE: bind IP is found in Heat replacing the network name with the local node IP + # for the given network; replacement examples (eg. for internal_api): + # internal_api -> IP + # internal_api_uri -> [IP] + # internal_api_subnet - > IP/CIDR + tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: + str_replace: + template: "NETWORK_uri" + params: + NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]} step_config: | include ::tripleo::profile::base::cinder::volume |