Skip to content

Commit 21879dc

Browse files
soheilhysoheilhy
committed
2 parents 29233eb + 8d2c8fa commit 21879dc

21 files changed

Lines changed: 525 additions & 410 deletions

‎AUTHORS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Anthony Young <sleepsonthefloor@gmail.com>
55
Armando Migliaccio <armando.migliaccio@eu.citrix.com>
66
Brad Hall <brad@nicira.com>
77
Chmouel Boudjnah <chmouel@chmouel.com>
8+
Dan Prince <dprince@redhat.com>
89
Dean Troyer <dtroyer@gmail.com>
910
Devin Carlen <devin.carlen@gmail.com>
1011
Eddie Hebert <edhebert@gmail.com>
@@ -26,6 +27,7 @@ Ken Pepple <ken.pepple@rabbityard.com>
2627
Kiall Mac Innes <kiall@managedit.ie>
2728
Russell Bryant <rbryant@redhat.com>
2829
Scott Moser <smoser@ubuntu.com>
30+
Thierry Carrez <thierry@openstack.org>
2931
Todd Willey <xtoddx@gmail.com>
3032
Tres Henry <tres@treshenry.net>
3133
Vishvananda Ishaya <vishvananda@gmail.com>

‎exerciserc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,9 @@ export RUNNING_TIMEOUT=${RUNNING_TIMEOUT:-$(($BOOT_TIMEOUT + $ACTIVE_TIMEOUT))}
2020

2121
# Max time to wait for a vm to terminate
2222
export TERMINATE_TIMEOUT=${TERMINATE_TIMEOUT:-30}
23+
24+
# Max time to wait for a euca-volume command to propogate
25+
export VOLUME_TIMEOUT=${VOLUME_TIMEOUT:-30}
26+
27+
# Max time to wait for a euca-delete command to propogate
28+
export VOLUME_DELETE_TIMEOUT=${SNAPSHOT_DELETE_TIMEOUT:-60}

‎exercises/euca.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ set -o xtrace
2424
# Keep track of the current directory
2525
EXERCISE_DIR=$(cd $(dirname "$0") && pwd)
2626
TOP_DIR=$(cd $EXERCISE_DIR/..; pwd)
27+
VOLUME_ZONE=cinder
28+
VOLUME_SIZE=1
29+
ATTACH_DEVICE=/dev/vdc
2730

2831
# Import common functions
2932
source $TOP_DIR/functions

‎exercises/volumes.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ source $TOP_DIR/openrc
3333
# Import exercise configuration
3434
source $TOP_DIR/exerciserc
3535

36+
# If cinder or n-vol are not enabled we exit with exitcode 55 which mean
37+
# exercise is skipped.
38+
is_service_enabled cinder n-vol || exit 55
39+
3640
# Instance type to create
3741
DEFAULT_INSTANCE_TYPE=${DEFAULT_INSTANCE_TYPE:-m1.tiny}
3842

‎files/apache-horizon.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<VirtualHost *:80>
22
WSGIScriptAlias / %HORIZON_DIR%/openstack_dashboard/wsgi/django.wsgi
33
WSGIDaemonProcess horizon user=%USER% group=%GROUP% processes=3 threads=10 home=%HORIZON_DIR%
4+
WSGIApplicationGroup %{GLOBAL}
45

56
SetEnv APACHE_RUN_USER %USER%
67
SetEnv APACHE_RUN_GROUP %GROUP%

‎files/apts/cinder‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
tgt
2+
lvm2

‎files/apts/horizon‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apache2 # NOPRIME
22
libapache2-mod-wsgi # NOPRIME
3+
python-beautifulsoup
34
python-dateutil
45
python-paste
56
python-pastedeploy

‎files/keystone_data.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# service nova admin, [ResellerAdmin (swift only)]
1010
# service quantum admin # if enabled
1111
# service swift admin # if enabled
12+
# service cinder admin # if enabled
1213
# demo admin admin
1314
# demo demo Member, anotherrole
1415
# invisible_to_admin demo Member
@@ -128,3 +129,13 @@ if [[ "$ENABLED_SERVICES" =~ "tempest" ]]; then
128129
--email=alt_demo@example.com)
129130
keystone user-role-add --user $ALT_DEMO_USER --role $MEMBER_ROLE --tenant_id $ALT_DEMO_TENANT
130131
fi
132+
133+
if [[ "$ENABLED_SERVICES" =~ "cinder" ]]; then
134+
CINDER_USER=$(get_id keystone user-create --name=cinder \
135+
--pass="$SERVICE_PASSWORD" \
136+
--tenant_id $SERVICE_TENANT \
137+
--email=cinder@example.com)
138+
keystone user-role-add --tenant_id $SERVICE_TENANT \
139+
--user_id $CINDER_USER \
140+
--role_id $ADMIN_ROLE
141+
fi

‎files/rpms/cinder‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
lvm2
2+
scsi-target-utils

‎files/rpms/horizon‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ httpd # NOPRIME
55
mod_wsgi # NOPRIME
66
pylint
77
python-anyjson
8+
python-BeautifulSoup
89
python-boto
910
python-coverage
1011
python-dateutil

0 commit comments

Comments
 (0)