diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-07-25 18:24:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-07-25 18:24:06 +0000 |
| commit | 58abc34d69e98f8ee79069569b2cf0c40d34352d (patch) | |
| tree | 730219c7364526a3648e782262e761b81b46959e | |
| parent | 723cdf75e5089dabd93f72ed2eba4aeb6a18ee75 (diff) | |
| parent | 1924e3ac3a04c930648dcc104853cbafa61e2132 (diff) | |
Merge "Fix SSL with HAProxy."
| -rw-r--r-- | overcloud-source.yaml | 8 | ||||
| -rw-r--r-- | ssl-source.yaml | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 068c8532..ce86dfa9 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -739,6 +739,14 @@ Resources: server: {Ref: controller0} signal_transport: NO_SIGNAL input_values: + controller_host: + Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - controller0 + - networks ssl_certificate: {Ref: SSLCertificate} ssl_key: {Ref: SSLKey} ssl_ca_certificate: {Ref: SSLCACertificate} diff --git a/ssl-source.yaml b/ssl-source.yaml index 38d6d7ec..e64eca51 100644 --- a/ssl-source.yaml +++ b/ssl-source.yaml @@ -31,24 +31,40 @@ Resources: - name: 'ec2' accept: 13773 connect: 8773 + connect_host: + get_input: controller_host - name: 'image' accept: 13292 connect: 9292 + connect_host: + get_input: controller_host - name: 'identity' accept: 13000 connect: 5000 + connect_host: + get_input: controller_host - name: 'network' accept: 13696 connect: 9696 + connect_host: + get_input: controller_host - name: 'compute' accept: 13774 connect: 8774 + connect_host: + get_input: controller_host - name: 'swift-proxy' accept: 13080 connect: 8080 + connect_host: + get_input: controller_host - name: 'cinder' accept: 13776 connect: 8776 + connect_host: + get_input: controller_host - name: 'ceilometer' accept: 13777 connect: 8777 + connect_host: + get_input: controller_host |