diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-11 15:49:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-11 15:49:45 +0000 |
| commit | 327cf3fb6a1c5745fa9666d4e2762ee1e4eac853 (patch) | |
| tree | 72edd411a81c2eff5ab4bfabebc639d0ebc6d8ac /mcp/reclass/classes/cluster | |
| parent | 81dad2be6c0851bea9a06841a26ea26ea3c7a82f (diff) | |
| parent | 2c77ae5cc40df831e6cfa996ac192b7b4f7b24b3 (diff) | |
Merge "Smooth down API proxy config"
Diffstat (limited to 'mcp/reclass/classes/cluster')
3 files changed, 17 insertions, 14 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 index ebec944da..cdebe3fb3 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -131,6 +131,16 @@ parameters: cacert: /etc/ssl/certs/mcp_os_cacert openrc_extra: volume_device_name: vdc + haproxy: + proxy: + listen: + nova_placement_api: + health-check: + http: + ~options: + - expect status 405 + ~heat_cloudwatch_api: + enabled: false bind: server: control: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 index 34ec10664..5ddb9860a 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 @@ -67,8 +67,6 @@ parameters: <<: *nginx_openstack_proxy_address nginx_proxy_openstack_api_heat_cfn: <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_heat_cloudwatch: - <<: *nginx_openstack_proxy_address nginx_proxy_openstack_api_keystone: <<: *nginx_openstack_proxy_address nginx_proxy_openstack_api_keystone_private: @@ -85,6 +83,12 @@ parameters: <<: *nginx_openstack_proxy_address nginx_static_reclass_doc: <<: *nginx_openstack_proxy_address +{%- else %} + nginx: + server: + site: + nginx_proxy_openstack_api_heat_cloudwatch: + enabled: false {%- endif %} salt: minion: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml index 7235071f5..881d90dcc 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml @@ -45,17 +45,6 @@ parameters: host: ${_param:cluster_node01_address} port: 9191 params: ${_param:haproxy_check} - heat_cloudwatch_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8003 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8003 - params: ${_param:haproxy_check} heat_api: type: openstack-service service_name: heat @@ -122,7 +111,7 @@ parameters: health-check: http: options: - - expect status 401 + - expect status 405 servers: - name: ctl01 host: ${_param:cluster_node01_address} |