diff options
| -rw-r--r-- | block-storage.yaml | 2 | ||||
| -rw-r--r-- | overcloud-source.yaml | 8 | ||||
| -rw-r--r-- | ssl-source.yaml | 16 |
3 files changed, 26 insertions, 0 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index 55a629a0..da5f9edc 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -22,6 +22,7 @@ Resources: {Ref: BlockStorageImage} flavor: {Ref: OvercloudBlockStorageFlavor} key_name: {Ref: KeyName} + user_data_format: SOFTWARE_CONFIG BlockStorage0Deployment: Type: OS::Heat::StructuredDeployment Properties: @@ -31,6 +32,7 @@ Resources: controller_host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } cinder_dsn: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } , '/cinder']]} neutron_local_ip: {"Fn::Select": [0, "Fn::Select": [ctlplane, {"Fn::GetAtt": [BlockStorage0 , networks]}]]} + signal_transport: NO_SIGNAL BlockStorageConfig: Type: OS::Heat::StructuredConfig Properties: 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 |