diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-06-16 05:24:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-06-16 05:24:38 +0000 |
| commit | 36ff86ceb4e1f0a6a909e8c8a0f5cae9b2e7487a (patch) | |
| tree | 50690bbd1f9125c3838bc45bf9a735f1a4ddbe68 | |
| parent | 441b60b43c5acff0ead6203dc7e28621db363c82 (diff) | |
| parent | c82cc1d485a148b6ab5a402643f3cf5ce4ef343b (diff) | |
Merge "Use virtual ip for OS services"
| -rw-r--r-- | overcloud-source.yaml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 5e28ac0f..7ecb92ce 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -409,6 +409,8 @@ Resources: get_input: controller_host db-password: unset glance: + registry: + host: {get_input: controller_virtual_ip} backend: swift db: mysql://glance:unset@localhost/glance host: @@ -446,8 +448,7 @@ Resources: innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize} neutron: flat-networks: {Ref: NeutronFlatNetworks} - host: - get_input: controller_host + host: {get_input: controller_virtual_ip} metadata_proxy_shared_secret: unset ovs: enable_tunneling: 'True' @@ -483,8 +484,7 @@ Resources: db: mysql://nova:unset@localhost/nova default_floating_pool: ext-net - host: - get_input: controller_host + host: {get_input: controller_virtual_ip} metadata-proxy: true service-password: Ref: NovaPassword @@ -622,6 +622,8 @@ Resources: - show - 'novalocal' - {Ref: CloudName} + controller_virtual_ip: + {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} controller0SSLDeployment: Type: OS::Heat::StructuredDeployment Properties: |