summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-11 18:27:45 +0000
committerGerrit Code Review <review@openstack.org>2017-01-11 18:27:45 +0000
commitcef683bd01cff0e5ee87d35567900a064937aeca (patch)
tree85d8648ac2e5d04c0eccfe0354e0a61b72a63873
parent04d8eb58679487750e161477134073e4d1acdc7c (diff)
parent4ed76f6850ffdd89c740056938323687de369473 (diff)
Merge "Reduce min-ram for ubuntu images for devstack"0.4.0
-rw-r--r--devstack/plugin.sh20
-rwxr-xr-xtools/check_devstack_plugin.sh4
2 files changed, 16 insertions, 8 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d8456bf..df28201 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -233,31 +233,36 @@ providers:
233 # Long boot timeout to deal with potentially nested virt. 233 # Long boot timeout to deal with potentially nested virt.
234 boot-timeout: 600 234 boot-timeout: 600
235 launch-timeout: 900 235 launch-timeout: 900
236 max-servers: 2 236 max-servers: 5
237 rate: 0.25 237 rate: 0.25
238 images: 238 images:
239 - name: centos-7 239 - name: centos-7
240 min-ram: 1024 240 min-ram: 1024
241 name-filter: 'nodepool'
241 username: devuser 242 username: devuser
242 private-key: $NODEPOOL_KEY 243 private-key: $NODEPOOL_KEY
243 config-drive: true 244 config-drive: true
244 - name: fedora-24 245 - name: fedora-24
245 min-ram: 1024 246 min-ram: 1024
247 name-filter: 'nodepool'
246 username: devuser 248 username: devuser
247 private-key: $NODEPOOL_KEY 249 private-key: $NODEPOOL_KEY
248 config-drive: true 250 config-drive: true
249 - name: ubuntu-precise 251 - name: ubuntu-precise
250 min-ram: 1024 252 min-ram: 512
253 name-filter: 'nodepool'
251 username: devuser 254 username: devuser
252 private-key: $NODEPOOL_KEY 255 private-key: $NODEPOOL_KEY
253 config-drive: true 256 config-drive: true
254 - name: ubuntu-trusty 257 - name: ubuntu-trusty
255 min-ram: 1024 258 min-ram: 512
259 name-filter: 'nodepool'
256 username: devuser 260 username: devuser
257 private-key: $NODEPOOL_KEY 261 private-key: $NODEPOOL_KEY
258 config-drive: true 262 config-drive: true
259 - name: ubuntu-xenial 263 - name: ubuntu-xenial
260 min-ram: 1024 264 min-ram: 512
265 name-filter: 'nodepool'
261 username: devuser 266 username: devuser
262 private-key: $NODEPOOL_KEY 267 private-key: $NODEPOOL_KEY
263 config-drive: true 268 config-drive: true
@@ -404,8 +409,11 @@ function configure_nodepool {
404function start_nodepool { 409function start_nodepool {
405 # build a custom flavor that's more friendly to nodepool 410 # build a custom flavor that's more friendly to nodepool
406 local available_flavors=$(nova flavor-list) 411 local available_flavors=$(nova flavor-list)
407 if [[ ! ( $available_flavors =~ 'm1.nodepool' ) ]]; then 412 if [[ ! ( $available_flavors =~ 'nodepool-512' ) ]]; then
408 nova flavor-create m1.nodepool 64 1024 0 1 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 fi 417 fi
410 418
411 # build sec group rules to reach the nodes, we need to do this 419 # build sec group rules to reach the nodes, we need to do this
diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh
index 5c8ab13..fcc6562 100755
--- a/tools/check_devstack_plugin.sh
+++ b/tools/check_devstack_plugin.sh
@@ -1,4 +1,4 @@
1#!/bin/bash -x 1#!/bin/bash -ex
2 2
3NODEPOOL_INSTALL=${NODEPOOL_INSTALL:-/opt/stack/new/nodepool-venv} 3NODEPOOL_INSTALL=${NODEPOOL_INSTALL:-/opt/stack/new/nodepool-venv}
4NODEPOOL_CONFIG=${NODEPOOL_CONFIG:-/etc/nodepool/nodepool.yaml} 4NODEPOOL_CONFIG=${NODEPOOL_CONFIG:-/etc/nodepool/nodepool.yaml}
@@ -68,7 +68,7 @@ if [ $NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB = 'false' ]; then
68 waitfornode ubuntu-trusty 68 waitfornode ubuntu-trusty
69fi 69fi
70 70
71if [ $NODEPOOL_PAUSE_UBUNTU_XENIAL = 'false' ]; then 71if [ $NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB = 'false' ]; then
72 # check that image built 72 # check that image built
73 waitforimage ubuntu-xenial 73 waitforimage ubuntu-xenial
74 # check image was bootable 74 # check image was bootable