diff options
author | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-06-18 16:46:25 +0400 |
---|---|---|
committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-06-18 17:13:52 +0400 |
commit | bc70493008a9194ec215214c97175d870eadcbf8 (patch) | |
tree | beb0a4047c9b75bfd6e217edbea960f2b8477673 /mcp/reclass/classes/cluster/mcp-common-noha | |
parent | 06c464a9c2aee9cbfa801b2f3842bd0beca62291 (diff) |
Rectify nova placement API check
* make a GET request to placement service as it returns 200 with
version data starting from nova 17.0
* turn on nova image preallocation mode on baremetal computes
* double salt worker threads by number of available CPU
Change-Id: I509cbab3b4b8460452f5e487e457edfedd5da29a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-noha')
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml | 9 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml | 2 |
2 files changed, 2 insertions, 9 deletions
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 881d90dcc..9fe5247a4 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 @@ -101,17 +101,10 @@ parameters: port: 9696 params: ${_param:haproxy_check} nova_placement_api: - mode: http + type: openstack-service binds: - address: ${_param:cluster_vip_address} port: 8778 - options: - - httpclose - - httplog - health-check: - http: - options: - - expect status 405 servers: - name: ctl01 host: ${_param:cluster_node01_address} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml index 22bf6d8b1..0a2924bac 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml @@ -54,7 +54,7 @@ parameters: salt: master: file_recv: true - worker_threads: 2 + worker_threads: 4 command_timeout: 20 reclass: storage: |