diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-27 08:43:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-27 08:43:15 +0000 |
| commit | 2c73a7b6ac1dcb58977a2241dd29879c074ff14a (patch) | |
| tree | 14a0a1726ad3a41de2e7279dc59f218116532607 | |
| parent | b47fb9be0658933c7e1764902389a88f247421af (diff) | |
| parent | 089c26acab8ed3b5a6c32ea862969d71f7bd033c (diff) | |
Merge "Map Cinder services to isolated networks"
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 2 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 9c5ed1bc..b4c3b5a2 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -68,3 +68,5 @@ parameter_defaults: NeutronLocalIp: tenant CeilometerApiNetwork: internal_api MongoDbNetwork: internal_api + CinderApiNetwork: internal_api + CinderIscsiNetwork: storage diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 0e5ab116..b012b4f4 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -731,12 +731,12 @@ resources: cinder_enable_rbd_backend: {get_input: cinder_enable_rbd_backend} cinder_lvm_loop_device_size: {get_input: cinder_lvm_loop_device_size} cinder_iscsi_helper: {get_input: cinder_iscsi_helper} - cinder_iscsi_ip_address: {get_input: controller_host} + cinder_iscsi_ip_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]} cinder::database_connection: {get_input: cinder_dsn} cinder::api::keystone_password: {get_input: cinder_password} cinder::api::auth_uri: {get_input: keystone_auth_uri} cinder::api::identity_uri: {get_input: keystone_identity_uri} - cinder::api::bind_host: {get_input: controller_host} + cinder::api::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]} cinder::rabbit_userid: {get_input: rabbit_username} cinder::rabbit_password: {get_input: rabbit_password} cinder::rabbit_use_ssl: {get_input: rabbit_client_use_ssl} |