Change start -> work, final -> trunk
Just renames files and the consequences that follow. Environment vars to follow...
This commit is contained in:
Dean Troyer
parent
ab388ac995
commit
2afcf5a988
42
README.md
42
README.md
|
|
@ -1,13 +1,27 @@
|
|||
Grenade is an OpenStack upgrade test harness to exercise the
|
||||
upgrade process from Essex to Folsom. It uses DevStack to perform
|
||||
the initial OpenStack install.
|
||||
upgrade process between releases. It uses DevStack to perform
|
||||
the initial OpenStack install and as a reference for the final
|
||||
configuration.
|
||||
|
||||
While the initial incarnation of Grenade is written to upgrade
|
||||
from Essex to Folsom it needs to be generalized for future releases.
|
||||
|
||||
# Goals
|
||||
|
||||
* Install base Essex OpenStack using stable/essex devstack
|
||||
* Perform basic testing (exercise.sh) and leave some instances running with data
|
||||
* Run upgrade script preserving running instances and data
|
||||
* Install base Folsom (trunk) OpenStack and compare to upgrade
|
||||
* Install base Folsom (trunk) OpenStack for reference to upgrade
|
||||
* Install base Essex OpenStack using stable/essex DevStack
|
||||
* Perform basic testing (exercise.sh)
|
||||
* Create some non-default configuration to use as a conversion reference
|
||||
* Run upgrade script preserving (running?) instances and data
|
||||
|
||||
|
||||
# Terminology
|
||||
|
||||
Grenade has two DevStack installs present and distinguished between then
|
||||
as 'work' and 'trunk'.
|
||||
|
||||
* **work**: The initial install that is will be upgraded.
|
||||
* **trunk**: The reference install of trunk OpenStack (maybe just DevStack)
|
||||
|
||||
|
||||
# Install Grenade
|
||||
|
|
@ -18,7 +32,7 @@ system that will run the upgrade testing.
|
|||
|
||||
./setup-grenade testbox
|
||||
|
||||
Grenade includes ``devstack.start.localrc`` for DevStack that is used to
|
||||
Grenade includes ``devstack.localrc.work`` for DevStack that is used to
|
||||
customize its behaviour for use with Grenade. By default ``setup-grenade``
|
||||
will set HOST_IP and DEST when copying it to the Grenade DevStack direcotry.
|
||||
|
||||
|
|
@ -27,16 +41,16 @@ will set HOST_IP and DEST when copying it to the Grenade DevStack direcotry.
|
|||
|
||||
./grenade.sh
|
||||
|
||||
``grenade.sh`` installs DevStack for both the **Start** release (Essex) and
|
||||
the **Final** release (Folsom) in separate directories. It then runs the
|
||||
**Start** release ``stack.sh``. This si roughly the equivalent to:
|
||||
``grenade.sh`` installs DevStack for both the **Work** release (Essex) and
|
||||
the **Trunk** release (Folsom) in separate directories. It then runs the
|
||||
**Work** release ``stack.sh``. This is roughly the equivalent to:
|
||||
|
||||
./prep-final
|
||||
./prep-start
|
||||
./prep-trunk
|
||||
./prep-work
|
||||
cd /opt/stack.essex/devstack
|
||||
./stack.sh
|
||||
|
||||
At this point the **Start** release is running. Configure an
|
||||
At this point the **Work** release is running. Configure an
|
||||
imaginary **Javelin** tenant to populate the databases with some
|
||||
non-default content::
|
||||
|
||||
|
|
@ -44,7 +58,7 @@ non-default content::
|
|||
|
||||
This should leave an instance named ``peltast`` running.
|
||||
|
||||
Now run ``unstack.sh`` to shut down the **Start** OpenStack and begin the
|
||||
Now run ``unstack.sh`` to shut down the **Work** OpenStack and begin the
|
||||
upgrade testing.
|
||||
|
||||
Set up the **javelin** credentials with ``javelinrc``.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# localrc for devstack trunk
|
||||
# localrc for DevStack trunk installation (master)
|
||||
|
||||
# These are set by setup-grenade
|
||||
HOST_IP=
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# localrc for devstack stable/essex
|
||||
# localrc for DevStack work installation (stable/essex)
|
||||
|
||||
# These are set by setup-grenade
|
||||
HOST_IP=
|
||||
|
|
@ -30,10 +30,10 @@ set -o xtrace
|
|||
# =============
|
||||
|
||||
# We'll need both releases of DevStack eventually so grab them both now.
|
||||
# Do final first so the 'current' state is pointing to the starting release.
|
||||
# Do the trunk release first so the end state is points to the work release.
|
||||
|
||||
$GRENADE_DIR/prep-final
|
||||
$GRENADE_DIR/prep-start
|
||||
$GRENADE_DIR/prep-trunk
|
||||
$GRENADE_DIR/prep-work
|
||||
|
||||
|
||||
# Install 'Start' Build of OpenStack
|
||||
|
|
@ -59,7 +59,7 @@ $GRENADE_DIR/setup-javelin
|
|||
echo $DEVSTACK_START_DIR/unstack.sh
|
||||
|
||||
# Don't do this for now
|
||||
#$GRENADE_DIR/wrap-start
|
||||
#$GRENADE_DIR/wrap-work
|
||||
|
||||
|
||||
# Fin
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# ``prep-final`` handles the preparations for installing and configuring
|
||||
# the "final" configuration of DevStack.
|
||||
# ``prep-trunk`` handles the preparations for installing and configuring
|
||||
# the "trunk" configuration of DevStack.
|
||||
|
||||
|
||||
# Keep track of the devstack directory
|
||||
|
|
@ -32,9 +32,9 @@ mkdir -p $FINAL_DIR
|
|||
git_clone $DEVSTACK_FINAL_REPO $DEVSTACK_FINAL_DIR $DEVSTACK_FINAL_BRANCH
|
||||
|
||||
# Set up localrc
|
||||
cp -p $GRENADE_DIR/devstack.final.localrc $DEVSTACK_FINAL_DIR/localrc
|
||||
cp -p $GRENADE_DIR/devstack.localrc.trunk $DEVSTACK_FINAL_DIR/localrc
|
||||
|
||||
# Set up a symlink to the 'final' devstack installation
|
||||
# Set up a symlink to the 'trunk' DevStack installation
|
||||
rm -f $GRENADE_DIR/devstack
|
||||
ln -s $DEVSTACK_FINAL_DIR $GRENADE_DIR/devstack
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# ``prep-start`` handles the preparations for installing and configuring
|
||||
# the "start" configuration of DevStack.
|
||||
# ``prep-work`` handles the preparations for installing and configuring
|
||||
# the "work" configuration of DevStack.
|
||||
|
||||
|
||||
# Keep track of the devstack directory
|
||||
|
|
@ -32,9 +32,9 @@ mkdir -p $START_DIR
|
|||
git_clone $DEVSTACK_START_REPO $DEVSTACK_START_DIR $DEVSTACK_START_BRANCH
|
||||
|
||||
# Set up localrc
|
||||
cp -p $GRENADE_DIR/devstack.start.localrc $DEVSTACK_START_DIR/localrc
|
||||
cp -p $GRENADE_DIR/devstack.localrc.work $DEVSTACK_START_DIR/localrc
|
||||
|
||||
# Set up a symlink to the 'start' devstack installation
|
||||
# Set up a symlink to the 'work' DevStack installation
|
||||
rm -f $GRENADE_DIR/devstack
|
||||
ln -s $DEVSTACK_START_DIR $GRENADE_DIR/devstack
|
||||
|
||||
|
|
@ -29,11 +29,11 @@ ssh -t $DEST_USER@$HOST " \
|
|||
sed -i \"
|
||||
/^DEST=/s|^DEST=.*$|DEST=$START_DIR|;
|
||||
/^HOST_IP=/s|^HOST_IP=.*$|HOST_IP=\$IP|;
|
||||
\" $GRENADE_DIR/devstack.start.localrc; \
|
||||
\" $GRENADE_DIR/devstack.localrc.work; \
|
||||
sed -i \"
|
||||
/^DEST=/s|^DEST=.*$|DEST=$FINAL_DIR|;
|
||||
/^HOST_IP=/s|^HOST_IP=.*$|HOST_IP=\$IP|;
|
||||
\" $GRENADE_DIR/devstack.final.localrc; \
|
||||
\" $GRENADE_DIR/devstack.localrc.trunk; \
|
||||
"
|
||||
|
||||
# Copy devstack.localrc if it exists
|
||||
|
|
@ -41,9 +41,10 @@ if [[ -r $SRC_DIR/devstack.localrc ]]; then
|
|||
scp -p $SRC_DIR/devstack.localrc $DEST_USER@$HOST:$GRENADE_DIR
|
||||
fi
|
||||
|
||||
# And append it to the work and trunk localrc files
|
||||
ssh -t $DEST_USER@$HOST " \
|
||||
[[ -r $GRENADE_DIR/devstack.localrc ]] && cat $GRENADE_DIR/devstack.localrc \
|
||||
>>$GRENADE_DIR/devstack.start.localrc; \
|
||||
>>$GRENADE_DIR/devstack.localrc.work; \
|
||||
[[ -r $GRENADE_DIR/devstack.localrc ]] && cat $GRENADE_DIR/devstack.localrc \
|
||||
>>$GRENADE_DIR/devstack.final.localrc; \
|
||||
>>$GRENADE_DIR/devstack.localrc.trunk; \
|
||||
"
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ GLANCE_API_CONF=${GLANCE_API_CONF:-$GLANCE_CONF_DIR/glance-api.conf}
|
|||
GLANCE_REGISTRY_PASTE_INI=${GLANCE_REGISTRY_PASTE_INI:-$GLANCE_CONF_DIR/glance-registry-paste.ini}
|
||||
GLANCE_API_PASTE_INI=${GLANCE_API_PASTE_INI:-$GLANCE_CONF_DIR/glance-api-paste.ini}
|
||||
|
||||
# Duplicate some setup bits from DevStack final
|
||||
# Duplicate some setup bits from trunk DevStack
|
||||
(cd $DEVSTACK_FINAL_DIR; \
|
||||
DEST=$START_DIR; \
|
||||
source ./stackrc; \
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ MYSQL_HOST=${MYSQL_HOST:-localhost}
|
|||
MYSQL_USER=${MYSQL_USER:-root}
|
||||
BASE_SQL_CONN=$(source $DEVSTACK_START_DIR/stackrc; echo ${BASE_SQL_CONN:-mysql://$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST})
|
||||
|
||||
# Duplicate some setup bits from DevStack final
|
||||
# Duplicate some setup bits from trunk DevStack
|
||||
(cd $DEVSTACK_FINAL_DIR; \
|
||||
DEST=$START_DIR; \
|
||||
source ./stackrc; \
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ set -o xtrace
|
|||
# -----------------
|
||||
|
||||
# DevStack changed the default storage for volumes between Essex and Folsom
|
||||
# * move /opt/stack/nova-volumes-backing-file to
|
||||
# * move /opt/stack/nova-volumes-backing-file to
|
||||
# /opt/stack/data/stack-volumes-backing-file
|
||||
# * volume group name changed from nova-volumes to stack-volumes
|
||||
# * default size is now 5GB, we don't change that here
|
||||
|
|
@ -58,7 +58,7 @@ fi
|
|||
# Migrate to Cinder
|
||||
# -----------------
|
||||
|
||||
# install cinder code from ~final/devstack/lib/cinder:install_cinder()
|
||||
# install cinder code from ~trunk/devstack/lib/cinder:install_cinder()
|
||||
|
||||
MYSQL_HOST=${MYSQL_HOST:-localhost}
|
||||
MYSQL_USER=${MYSQL_USER:-root}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# ``wrap-final`` handles the cleanup of the "final" configuration of DevStack.
|
||||
# ``wrap-trunk`` handles the cleanup of the "trunk" configuration of DevStack.
|
||||
|
||||
|
||||
# Keep track of the devstack directory
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# ``wrap-start`` handles the cleanup of the "start" configuration of DevStack.
|
||||
# ``wrap-work`` handles the cleanup of the "work" configuration of DevStack.
|
||||
|
||||
|
||||
# Keep track of the devstack directory
|
||||
Loading…
Reference in New Issue