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 | |
| 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')
5 files changed, 5 insertions, 16 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml index 06c4ebd15..208393e52 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml @@ -67,7 +67,7 @@ parameters: master: accept_policy: open_mode file_recv: true - worker_threads: 4 + worker_threads: 8 command_timeout: 20 reclass: storage: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml index c793f9759..c8605462b 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -71,3 +71,4 @@ parameters: nova: compute: disk_cachemodes: file=directsync,block=none + preallocate_images: space 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 52f5f9101..1870cc46b 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 @@ -21,7 +21,7 @@ classes: - system.designate.server.cluster - system.designate.server.backend.bind - system.bind.server.single - - system.haproxy.proxy.listen.openstack.nova-placement + - system.haproxy.proxy.listen.openstack.placement - system.glusterfs.client.cluster - system.glusterfs.client.volume.glance - system.glusterfs.client.volume.keystone @@ -134,11 +134,6 @@ parameters: haproxy: proxy: listen: - nova_placement_api: - health-check: - http: - ~options: - - expect status 405 heat_cloudwatch_api: enabled: false bind: 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: |