Skip to content

Commit 75bbd75

Browse files
vishvanandavishvananda
committed
Allow euca-upload-bundle to work with devstack
 * modifies stack.sh to run nova-cert and nova-objectstore * adds exercises/bundle.sh to test for bundling * requires https://review.openstack.org/#change,3200 Change-Id: I850891948fbdfdf5890225f94df755e5dbc733d0
1 parent 30439a6 commit 75bbd75

File tree

3 files changed

+68
-1
lines changed

3 files changed

+68
-1
lines changed

‎exercises/bundle.sh‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#!/usr/bin/env bash
2+
3+
# we will use the ``euca2ools`` cli tool that wraps the python boto
4+
# library to test ec2 compatibility
5+
#
6+
7+
# This script exits on an error so that errors don't compound and you see
8+
# only the first error that occured.
9+
set -o errexit
10+
11+
# Print the commands being run so that we can see the command that triggers
12+
# an error. It is also useful for following allowing as the install occurs.
13+
set -o xtrace
14+
15+
# Settings
16+
# ========
17+
18+
# Use openrc + stackrc + localrc for settings
19+
pushd $(cd $(dirname "$0")/.. && pwd)
20+
source ./openrc
21+
22+
# Remove old certificates
23+
rm -f cacert.pem
24+
rm -f cert.pem
25+
rm -f pk.pem
26+
27+
# Get Certificates
28+
nova x509-get-root-cert
29+
nova x509-create-cert
30+
popd
31+
32+
# Max time to wait for image to be registered
33+
REGISTER_TIMEOUT=${REGISTER_TIMEOUT:-15}
34+
35+
BUCKET=testbucket
36+
IMAGE=bundle.img
37+
truncate -s 5M /tmp/$IMAGE
38+
euca-bundle-image -i /tmp/$IMAGE
39+
40+
41+
euca-upload-bundle -b $BUCKET -m /tmp/$IMAGE.manifest.xml
42+
AMI=`euca-register $BUCKET/$IMAGE.manifest.xml | cut -f2`
43+
44+
# Wait for the image to become available
45+
if ! timeout $REGISTER_TIMEOUT sh -c "while euca-describe-images | grep '$AMI' | grep 'available'; do sleep 1; done"; then
46+
echo "Image $AMI not available within $REGISTER_TIMEOUT seconds"
47+
exit 1
48+
fi

‎openrc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,20 @@ export EC2_ACCESS_KEY=${USERNAME:-demo}
4949
# Secret key is set in the initial keystone data to the admin password
5050
export EC2_SECRET_KEY=${ADMIN_PASSWORD:-secrete}
5151

52+
# Euca2ools Certificate stuff for uploading bundles
53+
# You can get your certs using ./tools/get_certs.sh
54+
NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
55+
NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
56+
NOVA_KEY_DIR=${NOVARC%/*}
57+
export S3_URL=http://$SERVICE_HOST:3333
58+
export EC2_USER_ID=42 # nova does not use user id, but bundling requires it
59+
export EC2_PRIVATE_KEY=${NOVA_KEY_DIR}/pk.pem
60+
export EC2_CERT=${NOVA_KEY_DIR}/cert.pem
61+
export NOVA_CERT=${NOVA_KEY_DIR}/cacert.pem
62+
export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
63+
alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
64+
alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
65+
5266
# set log level to DEBUG (helps debug issues)
5367
# export NOVACLIENT_DEBUG=1
5468

‎stack.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ Q_PORT=${Q_PORT:-9696}
193193
Q_HOST=${Q_HOST:-localhost}
194194

195195
# Specify which services to launch. These generally correspond to screen tabs
196-
ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit,openstackx}
196+
ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit,openstackx}
197197

198198
# Name of the lvm volume group to use/create for iscsi volumes
199199
VOLUME_GROUP=${VOLUME_GROUP:-nova-volumes}
@@ -1143,6 +1143,9 @@ add_nova_flag "--allow_admin_api"
11431143
add_nova_flag "--scheduler_driver=$SCHEDULER"
11441144
add_nova_flag "--dhcpbridge_flagfile=$NOVA_DIR/bin/nova.conf"
11451145
add_nova_flag "--fixed_range=$FIXED_RANGE"
1146+
if [[ "$ENABLED_SERVICES" =~ "n-obj" ]]; then
1147+
add_nova_flag "--s3_host=$SERVICE_HOST"
1148+
fi
11461149
if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then
11471150
add_nova_flag "--network_manager=nova.network.quantum.manager.QuantumManager"
11481151
add_nova_flag "--quantum_connection_host=$Q_HOST"
@@ -1418,6 +1421,8 @@ fi
14181421
# within the context of our original shell (so our groups won't be updated).
14191422
# Use 'sg' to execute nova-compute as a member of the libvirtd group.
14201423
screen_it n-cpu "cd $NOVA_DIR && sg libvirtd $NOVA_DIR/bin/nova-compute"
1424+
screen_it n-crt "cd $NOVA_DIR && $NOVA_DIR/bin/nova-cert"
1425+
screen_it n-obj "cd $NOVA_DIR && $NOVA_DIR/bin/nova-objectstore"
14211426
screen_it n-vol "cd $NOVA_DIR && $NOVA_DIR/bin/nova-volume"
14221427
screen_it n-net "cd $NOVA_DIR && $NOVA_DIR/bin/nova-network"
14231428
screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler"

0 commit comments

Comments
 (0)