openstack
/
grenade
Code Issues Proposed changes

Cut over to grizzly -> havana 

* change BASE_RELEASE and TARGET_RELEASE in grenaderc
* remove work-arounds from devstack.localrc.target
* remove upgrade steps from the upgrade-* scripts
* change references to release names in variables to BASE_ and TARGET_
* remove Javelin check from check-sanity, will return in verify-javelin
  in https://review.openstack.org/#/c/26257/

Fixes bug 1175340

Change-Id: If1523c73ebefeaf3d3e3efdfbc053f47365d123a
This commit is contained in:
Dean Troyer 2013-05-02 11:36:22 -05:00
parent a2588256c1
commit 4099c25b68
12 changed files with 28 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.rst
View File

@ -9,7 +9,7 @@ their default DevStack configurations.
The master branch tests the upgrade path from the previous release
(aka 'base') to the current trunk (aka 'target'). Stable branches
of grenade will be created soon after an OpenStack release and after
of Grenade will be created soon after an OpenStack release and after
a corresponding DevStack stable branch is available.
For example, following the release of Grizzly and the creation of
@ -140,10 +140,10 @@ some non-default configuration.
This is roughly the equivalent to::
grenade/prep-base
(cd /opt/stack/folsom/devstack
(cd /opt/stack/grizzly/devstack
./stack.sh)
grenade/setup-javelin
(cd /opt/stack/folsom/devstack
(cd /opt/stack/grizzly/devstack
./unstack.sh)
# dump databases to $STACK_ROOT/save
grenade/prep-target

13
check-sanity
View File

@ -28,7 +28,7 @@ source $TARGET_DEVSTACK_DIR/openrc
# all the services should actually be running that we expect
NOT_RUNNING=""
for name in ${GRIZZLY_SERVICES}; do
for name in ${TARGET_SERVICES}; do
if ! is_running ${name}; then
NOT_RUNNING="$NOT_RUNNING $name"
fi
@ -41,11 +41,6 @@ if [[ -n "$NOT_RUNNING" ]]; then
exit 1
fi
# ensure that the peltast vm survived the upgrade
OS_USERNAME=admin nova list --all-tenants | grep peltast > /dev/null
RC=$?
if [[ $RC -ne 0 ]]; then
echo "peltast vm did not survice the upgrade, something is wrong"
OS_USERNAME=admin nova list --all-tenants
exit 1
fi
echo "*********************************************************************"
echo "SUCCESS: End $0"
echo "*********************************************************************"

2
devstack.localrc.base
View File

@ -1,4 +1,4 @@
# localrc for DevStack base installation (stable/folsom)
# localrc for DevStack base installation
GRENADE_PHASE=base
# Default to selecting an interface via the default route

14
devstack.localrc.target
View File

@ -29,20 +29,6 @@ SKIP_EXERCISES=boot_from_volume
STACK_LOG=stack.sh.log
VOLUME_BACKING_FILE_SIZE=10000M
# floating IP ports
DEFAULT_FLOATING_POOL=nova
PUBLIC_NETWORK_NAME=nova
enable_service swift
SWIFT_HASH=8213897fads879789asdf789
SWIFT_REPLICAS=1
# DevStack's Swift port defaults changed in the Grizzly cycle, we need to
# put it back to complete the upgrade without going through the ring build process.
OBJECT_PORT_BASE=6010
CONTAINER_PORT_BASE=6011
ACCOUNT_PORT_BASE=6012
# DevStack upgraded the cirros image between folsom and grizzly, use the old one here
DEFAULT_IMAGE_NAME=cirros-0.3.0-x86_64-uec
IMAGE_URLS=http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz

12
grenaderc
View File

@ -13,10 +13,10 @@ STACK_ROOT=/opt/stack
DATA_DIR=${STACK_ROOT}/data
# Release info
BASE_RELEASE=folsom
BASE_RELEASE=grizzly
BASE_RELEASE_DIR=${STACK_ROOT}/$BASE_RELEASE
TARGET_RELEASE=grizzly
TARGET_RELEASE=havana
TARGET_RELEASE_DIR=${STACK_ROOT}/$TARGET_RELEASE
# DevStack sources
@ -64,7 +64,7 @@ fi
# Defaults that use values from localrc go here
#Enable tempest on grizzly and folsom
# Enable tempest
ENABLE_TEMPEST=${ENABLE_TEMPEST:=True}
# We need RECLONE to get the updated branches; not everyone wants it though
@ -76,10 +76,8 @@ TARGET_RUN_EXERCISES=${RUN_EXERCISES:=True}
# TODO(sdague): make these complete afterwards
# The services we'd expect at each release
FOLSOM_SERVICES="nova-api nova-compute keystone glance-api cinder-api"
# The services we'd expect at each release
GRIZZLY_SERVICES="nova-api nova-conductor nova-compute keystone glance-api cinder-api"
BASE_SERVICES="nova-api nova-conductor nova-compute keystone glance-api cinder-api"
TARGET_SERVICES="nova-api nova-conductor nova-compute keystone glance-api cinder-api"
# Local variables:
# mode: shell-script

8
setup-javelin
View File

@ -67,8 +67,8 @@ export OS_PASSWORD=$JPASSWORD
# ----------------
# It's really cirros with our own name
# Assumes DevStack.$START has already set this up
CIRROS_IMAGE=${DEFAULT_IMAGE_NAME:-cirros-0.3.0-x86_64-uec}
# Assumes DevStack.$BASE has already set this up
CIRROS_IMAGE=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec}
CIRROS_DIR=$BASE_DEVSTACK_DIR/files/images/$CIRROS_IMAGE
KERNEL=$CIRROS_DIR/${CIRROS_IMAGE/uec/}vmlinuz
RAMDISK=$CIRROS_DIR/${CIRROS_IMAGE/uec/}initrd
@ -85,7 +85,7 @@ if [[ -z "$IMAGE" ]]; then
glance add name=$JAVELIN_IMAGE.img is_public=True container_format=ami disk_format=ami ${KERNEL_ID:+kernel_id=$KERNEL_ID} ${RAMDISK_ID:+ramdisk_id=$RAMDISK_ID} < "${ROOTDISK}"
IMAGE=$(nova image-list | awk "/ $JAVELIN_IMAGE.img / { print \$2 }")
die_if_not_set IMAGE "Failure getting image"
die_if_not_set $LINENO IMAGE "Failure getting image"
fi
@ -147,6 +147,6 @@ fi
# -----------------------
swift upload javelin /etc/hosts
if ! swift list javelin | grep -q README; then
if ! swift list javelin | grep -q hosts; then
die $LINENO "Swift upload failed"
fi

2
stop-base
View File

@ -67,7 +67,7 @@ sudo umount ${DATA_DIR}/swift/drives/images/swift.img || /bin/true
# ensure everything is shut down
STILL_RUNNING=""
for name in ${FOLSOM_SERVICES}; do
for name in ${BASE_SERVICES}; do
if is_running ${name}; then
STILL_RUNNING="$STILL_RUNNING $name"
fi

17
upgrade-cinder
View File

@ -80,6 +80,9 @@ install_cinderclient
install_cinder
install_cinderclient
# configure_cinder
# nothing to see here yet
# Simulate init_cinder()
create_cinder_volume_group
create_cinder_cache_dir
@ -87,20 +90,6 @@ create_cinder_cache_dir
# Migrate the database
cinder-manage db sync || die $LINENO "DB migration error"
# Let grizzly devstack re-create the include file
sudo rm -f /etc/tgt/conf.d/cinder.conf
iniset $CINDER_CONF DEFAULT osapi_volume_extension cinder.api.contrib.standard_extensions
cp $CINDER_DIR/etc/cinder/api-paste.ini $CINDER_API_PASTE_INI
iniset $CINDER_API_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST
iniset $CINDER_API_PASTE_INI filter:authtoken auth_port $KEYSTONE_AUTH_PORT
iniset $CINDER_API_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
iniset $CINDER_API_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $CINDER_API_PASTE_INI filter:authtoken admin_user cinder
iniset $CINDER_API_PASTE_INI filter:authtoken admin_password $SERVICE_PASSWORD
iniset $CINDER_API_PASTE_INI filter:authtoken signing_dir $CINDER_AUTH_CACHE_DIR
start_cinder
set +o xtrace

4
upgrade-devstack
View File

@ -23,8 +23,8 @@ set -o xtrace
# Upgrade DevStack
# ================
# Reconfigure DevStack for Folsom. Changes include new handling
# for ``ENABLED_SERVICES``
# noop
# Translate Services
# ------------------

10
upgrade-glance
View File

@ -81,15 +81,7 @@ install_glanceclient
install_glance
# configure_glance
# These keys are needed in Grizzly, didn't exist in Folsom
iniset $GLANCE_REGISTRY_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/registry
iniset $GLANCE_API_CONF keystone_authtoken signing_dir $GLANCE_AUTH_CACHE_DIR/api
# Paste shouldn't be touched by users, just copy them over
sudo cp -p $GLANCE_DIR/etc/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI
sudo cp -p $GLANCE_DIR/etc/glance-api-paste.ini $GLANCE_API_PASTE_INI
sudo cp -p $GLANCE_DIR/etc/policy.json $GLANCE_POLICY_JSON
# nothing to see here yet
# Simulate init_glance()
create_glance_cache_dir

4
upgrade-keystone
View File

@ -73,8 +73,8 @@ source $TARGET_DEVSTACK_DIR/lib/keystone
install_keystoneclient
install_keystone
# configure_keystone()
configure_keystone
# configure_keystone
# nothing to see here yet
# Simulate init_keystone()
# Migrate the database

4
upgrade-swift
View File

@ -78,8 +78,8 @@ cp -pr /etc/rsyncd.conf $SAVE_DIR
install_swift
install_swiftclient
# configure_swift()
configure_swift
# configure_swift
# nothing to see here yet
# Simulate swift_init()