diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-23 08:55:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-23 08:55:58 +0000 |
| commit | 81cc928ecae674b9c1806b406798cc5cccf5fe4b (patch) | |
| tree | 36343e32977a2e0e439c434f8e6ed7446cfab846 /overcloud-without-mergepy.yaml | |
| parent | 4a1bc7459886c85d88749447d4179be686743630 (diff) | |
| parent | 599dd5ad8da60e8870c69d50a0c587eadd1a00ad (diff) | |
Merge "Add support for isolating block storage nets"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
| -rw-r--r-- | overcloud-without-mergepy.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index ce79a52b..e13b9acb 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -782,9 +782,12 @@ resources: # Purpose of the dedicated BlockStorage nodes should be to use their local LVM CinderEnableIscsiBackend: {get_param: CinderEnableIscsiBackend} CinderPassword: {get_param: CinderPassword} - VirtualIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} KeyName: {get_param: KeyName} Flavor: {get_param: OvercloudBlockStorageFlavor} + VirtualIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} + GlancePort: {get_param: GlancePort} + GlanceProtocol: {get_param: GlanceProtocol} + GlanceApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]} RabbitPassword: {get_param: RabbitPassword} RabbitUserName: {get_param: RabbitUserName} RabbitClientUseSSL: {get_param: RabbitClientUseSSL} @@ -796,6 +799,8 @@ resources: template: {get_param: BlockStorageHostnameFormat} params: '%stackname%': {get_param: 'OS::stack_name'} + ServiceNetMap: {get_param: ServiceNetMap} + MysqlVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]} ObjectStorage: type: OS::Heat::ResourceGroup |