diff options
Diffstat (limited to 'mcp/config')
| -rw-r--r-- | mcp/config/scenario/os-nosdn-nofeature-noha.yaml | 8 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_ha | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index 7e0739037..46c8bddc1 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml @@ -34,10 +34,10 @@ virtual: threads: 2 numa: cell0: - memory: 4194304 + memory: 8388608 cpus: 0-3 cell1: - memory: 4194304 + memory: 8388608 cpus: 4-7 cmp002: vcpus: 8 @@ -48,8 +48,8 @@ virtual: threads: 2 numa: cell0: - memory: 4194304 + memory: 8388608 cpus: 0-3 cell1: - memory: 4194304 + memory: 8388608 cpus: 4-7 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 0f6858f1e..499c1d357 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -82,7 +82,3 @@ dashboard_host=$(salt -C 'I@nginx:server and *01*' --out=yaml cp.push \ upload_path='certs/os_cacert' | cut -d':' -f1) cd /etc/ssl/certs && \ ln -sf "/var/cache/salt/master/minions/${dashboard_host}/files/certs/os_cacert" - -# glance v1 api is required by orchestra tests -salt -I 'glance:server' ini.set_option /etc/glance/glance-api.conf '{DEFAULT: {enable_v1_api: True}}' -salt -I 'glance:server' service.restart glance-api |