zuul/nodepool
Code Issues Proposed changes

Merge "Use OCC cloud specifier in devstack plugin"

Browse Source
This commit is contained in:
Jenkins 2015-10-09 00:06:16 +00:00 committed by Gerrit Code Review
commit 67aba1c79b
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -180,11 +180,7 @@ labels:
providers: providers:
- name: devstack - name: devstack
region-name: '$REGION_NAME' region-name: '$REGION_NAME'
service-type: 'compute' cloud: devstack
username: 'demo'
project-name: 'demo'
password: '$ADMIN_PASSWORD'
auth-url: '$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION'
api-timeout: 60 api-timeout: 60
# Long boot timeout to deal with potentially nested virt. # Long boot timeout to deal with potentially nested virt.
boot-timeout: 600 boot-timeout: 600

23
tools/check_devstack_plugin.sh
View File

@ -1,5 +1,8 @@
#!/bin/bash -x #!/bin/bash -x
# Do this so that the nodepool commands below can find the
# clouds.yaml file
export OS_CLIENT_CONFIG_FILE=${OS_CLIENT_CONFIG_FILE:-/opt/stack/new/.config/openstack/clouds.yaml}
NODEPOOL_CONFIG=${NODEPOOL_CONFIG:-/etc/nodepool/nodepool.yaml} NODEPOOL_CONFIG=${NODEPOOL_CONFIG:-/etc/nodepool/nodepool.yaml}
NODEPOOL_SECURE=${NODEPOOL_SECURE:-/etc/nodepool/secure.conf} NODEPOOL_SECURE=${NODEPOOL_SECURE:-/etc/nodepool/secure.conf}
NODEPOOL="nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE" NODEPOOL="nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE"
@ -9,11 +12,11 @@ function waitforimage {
state='ready' state='ready'
while ! $NODEPOOL image-list | grep $name | grep $state; do while ! $NODEPOOL image-list | grep $name | grep $state; do
$NODEPOOL image-list > /tmp/.nodepool-image-list.txt $NODEPOOL image-list > /tmp/.nodepool-image-list.txt
$NODEPOOL list > /tmp/.nodepool-list.txt $NODEPOOL list > /tmp/.nodepool-list.txt
sudo mv /tmp/.nodepool-image-list.txt $WORKSPACE/logs/nodepool-image-list.txt sudo mv /tmp/.nodepool-image-list.txt $WORKSPACE/logs/nodepool-image-list.txt
sudo mv /tmp/.nodepool-list.txt $WORKSPACE/logs/nodepool-list.txt sudo mv /tmp/.nodepool-list.txt $WORKSPACE/logs/nodepool-list.txt
sleep 10 sleep 10
done done
} }
@ -22,11 +25,11 @@ function waitfornode {
state='ready' state='ready'
while ! $NODEPOOL list | grep $name | grep $state; do while ! $NODEPOOL list | grep $name | grep $state; do
$NODEPOOL image-list > /tmp/.nodepool-image-list.txt $NODEPOOL image-list > /tmp/.nodepool-image-list.txt
$NODEPOOL list > /tmp/.nodepool-list.txt $NODEPOOL list > /tmp/.nodepool-list.txt
sudo mv /tmp/.nodepool-image-list.txt $WORKSPACE/logs/nodepool-image-list.txt sudo mv /tmp/.nodepool-image-list.txt $WORKSPACE/logs/nodepool-image-list.txt
sudo mv /tmp/.nodepool-list.txt $WORKSPACE/logs/nodepool-list.txt sudo mv /tmp/.nodepool-list.txt $WORKSPACE/logs/nodepool-list.txt
sleep 10 sleep 10
done done
} }