diff options
| -rw-r--r-- | overcloud-source.yaml | 6 | ||||
| -rw-r--r-- | ssl-source.yaml | 29 |
2 files changed, 11 insertions, 24 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index bc36e90b..c08dcbde 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -780,6 +780,8 @@ resources: net_binds: - &control_vip {ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}} - &public_vip {ip: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}} + options: + - option httpchk GET / services: - name: keystone_admin port: 35357 @@ -795,6 +797,7 @@ resources: port: 9292 - name: glance_registry port: 9191 + options: # overwrite options as glace_reg needs auth for http req - name: heat_api port: 8004 - name: heat_cloudwatch @@ -820,8 +823,11 @@ resources: port: 6080 - name: ceilometer port: 8777 + options: # overwrite options as ceil needs auth for http req - name: swift_proxy_server port: 8080 + options: + - option httpchk GET /info - name: rabbitmq port: 5672 net_binds: diff --git a/ssl-source.yaml b/ssl-source.yaml index a03aac37..a9357323 100644 --- a/ssl-source.yaml +++ b/ssl-source.yaml @@ -21,53 +21,34 @@ resources: group: os-apply-config config: ssl: - ca_certificate: - get_input: ssl_ca_certificate + ca_certificate: {get_input: ssl_ca_certificate} stunnel: - cert: - get_input: ssl_certificate - key: - get_input: ssl_key - cacert: - get_input: ssl_ca_certificate + cert: {get_input: ssl_certificate} + key: {get_input: ssl_key} + cacert: {get_input: ssl_ca_certificate} + connect_host: {get_input: controller_host} ports: - 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 |