Browse Source

Merge "Reduce min-ram for ubuntu images for devstack"

Jenkins 2 years ago
parent
commit
cef683bd01
2 changed files with 16 additions and 8 deletions
  1. 14
    6
      devstack/plugin.sh
  2. 2
    2
      tools/check_devstack_plugin.sh

+ 14
- 6
devstack/plugin.sh View File

@@ -233,31 +233,36 @@ providers:
233 233
     # Long boot timeout to deal with potentially nested virt.
234 234
     boot-timeout: 600
235 235
     launch-timeout: 900
236
-    max-servers: 2
236
+    max-servers: 5
237 237
     rate: 0.25
238 238
     images:
239 239
       - name: centos-7
240 240
         min-ram: 1024
241
+        name-filter: 'nodepool'
241 242
         username: devuser
242 243
         private-key: $NODEPOOL_KEY
243 244
         config-drive: true
244 245
       - name: fedora-24
245 246
         min-ram: 1024
247
+        name-filter: 'nodepool'
246 248
         username: devuser
247 249
         private-key: $NODEPOOL_KEY
248 250
         config-drive: true
249 251
       - name: ubuntu-precise
250
-        min-ram: 1024
252
+        min-ram: 512
253
+        name-filter: 'nodepool'
251 254
         username: devuser
252 255
         private-key: $NODEPOOL_KEY
253 256
         config-drive: true
254 257
       - name: ubuntu-trusty
255
-        min-ram: 1024
258
+        min-ram: 512
259
+        name-filter: 'nodepool'
256 260
         username: devuser
257 261
         private-key: $NODEPOOL_KEY
258 262
         config-drive: true
259 263
       - name: ubuntu-xenial
260
-        min-ram: 1024
264
+        min-ram: 512
265
+        name-filter: 'nodepool'
261 266
         username: devuser
262 267
         private-key: $NODEPOOL_KEY
263 268
         config-drive: true
@@ -404,8 +409,11 @@ function configure_nodepool {
404 409
 function start_nodepool {
405 410
     # build a custom flavor that's more friendly to nodepool
406 411
     local available_flavors=$(nova flavor-list)
407
-    if [[ ! ( $available_flavors =~ 'm1.nodepool' ) ]]; then
408
-        nova flavor-create m1.nodepool 64 1024 0 1
412
+    if [[ ! ( $available_flavors =~ 'nodepool-512' ) ]]; then
413
+        nova flavor-create nodepool-512 64 512 0 1
414
+    fi
415
+    if [[ ! ( $available_flavors =~ 'nodepool-1024' ) ]]; then
416
+        nova flavor-create nodepool-1024 128 1024 0 1
409 417
     fi
410 418
 
411 419
     # build sec group rules to reach the nodes, we need to do this

+ 2
- 2
tools/check_devstack_plugin.sh View File

@@ -1,4 +1,4 @@
1
-#!/bin/bash -x
1
+#!/bin/bash -ex
2 2
 
3 3
 NODEPOOL_INSTALL=${NODEPOOL_INSTALL:-/opt/stack/new/nodepool-venv}
4 4
 NODEPOOL_CONFIG=${NODEPOOL_CONFIG:-/etc/nodepool/nodepool.yaml}
@@ -68,7 +68,7 @@ if [ $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB = 'false' ]; then
68 68
     waitfornode ubuntu-trusty
69 69
 fi
70 70
 
71
-if [ $NODEPOOL_PAUSE_UBUNTU_XENIAL = 'false' ]; then
71
+if [ $NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB = 'false' ]; then
72 72
     # check that image built
73 73
     waitforimage ubuntu-xenial
74 74
     # check image was bootable

Loading…
Cancel
Save