Change terms
* 'start', 'work' -> 'base' * 'final', 'trunk' -> 'target'
This commit is contained in:
Dean Troyer
parent
efb93a60d8
commit
ab24c172bd
|
|
@ -5,14 +5,13 @@ Contributing to Grenade
|
|||
General
|
||||
-------
|
||||
|
||||
Grenade is written in POSIX shell script. It is specifies BASH and is
|
||||
Grenade is written in POSIX shell script. It specifies BASH and is
|
||||
compatible with Bash 3.
|
||||
|
||||
Grenade's official repository is located on GitHub at
|
||||
https://github.com/nebula/grenade.git.
|
||||
|
||||
|
||||
|
||||
Scripts
|
||||
-------
|
||||
|
||||
|
|
@ -28,7 +27,7 @@ a subdirectory::
|
|||
GRENADE_DIR=$(cd $(dirname "$0") && pwd)
|
||||
|
||||
Many scripts will utilize shared functions from the ``functions`` file. This
|
||||
file is copied directly from DevStack (late folsom-vintage). There is also an
|
||||
file is copied directly from DevStack trunk periodically. There is also an
|
||||
rc file (``grenaderc``) that is sourced to set the default configuration of
|
||||
the user environment::
|
||||
|
||||
|
|
|
|||
42
README.rst
42
README.rst
|
|
@ -14,15 +14,15 @@ If you are looking for the Essex -> Folsom upgrade check out the
|
|||
Status
|
||||
------
|
||||
|
||||
Development has begun for the Folsom -> Grizzly upgrade.
|
||||
Development has begun for the Folsom (base-release) -> Grizzly (target-release) upgrade.
|
||||
|
||||
Goals
|
||||
-----
|
||||
|
||||
* Install base OpenStack using current stable/XXXX DevStack
|
||||
* Install base OpenStack using current stable/<base-release> DevStack
|
||||
* Perform basic testing (exercise.sh)
|
||||
* Create some non-default configuration to use as a conversion reference
|
||||
* Install current trunk DevStack to support the upgrades
|
||||
* Install current target DevStack to support the upgrades
|
||||
* Run upgrade scripts preserving (running?) instances and data
|
||||
|
||||
|
||||
|
|
@ -30,10 +30,10 @@ Terminology
|
|||
-----------
|
||||
|
||||
Grenade has two DevStack installs present and distinguished between then
|
||||
as 'work' and 'trunk'.
|
||||
as 'base' and 'target'.
|
||||
|
||||
* **Work**: The initial install that is will be upgraded.
|
||||
* **Trunk**: The reference install of trunk OpenStack (maybe just DevStack)
|
||||
* **Base**: The initial install that is will be upgraded.
|
||||
* **Target**: The reference install of target OpenStack (maybe just DevStack)
|
||||
|
||||
|
||||
Install Grenade
|
||||
|
|
@ -57,28 +57,28 @@ this to ``localrc``::
|
|||
GRENADE_REPO=git@github.com:dtroyer/grenade.git
|
||||
GRENADE_BRANCH=dt-test
|
||||
|
||||
Grenade includes ``devstack.localrc.work`` and ``devstack.localrc.trunk``
|
||||
Grenade includes ``devstack.localrc.base`` and ``devstack.localrc.target``
|
||||
for DevStack that are used to customize its behaviour for use with Grenade.
|
||||
If ``$DEST/devstack.$START_RELEASE/localrc`` does not exist the following is
|
||||
performed by ``prep-work``:
|
||||
If ``$DEST/devstack.$BASE_RELEASE/localrc`` does not exist the following is
|
||||
performed by ``prep-base``:
|
||||
|
||||
* ``devstack.localrc.work`` is copied to to ``$DEST/devstack.folsom/localrc``
|
||||
* ``devstack.localrc.base`` is copied to to ``$DEST/devstack.folsom/localrc``
|
||||
* if ``devstack.localrc`` exists it is appended ``$DEST/devstack.folsom/localrc``
|
||||
|
||||
Similar steps are performed by ``prep-trunk`` for ``devstack.grizzly``.
|
||||
Similar steps are performed by ``prep-target`` for ``devstack.grizzly``.
|
||||
|
||||
``devstack.localrc`` will be appended to both DevStack ``localrc`` files if it
|
||||
exists. ``devstack.localrc`` is not included in Grenade and will not be
|
||||
overwritten it if it exists.
|
||||
|
||||
To handle differences between the DevStack releases ``GRENADE_PHASE`` will
|
||||
be set to ``work`` or ``trunk`` so appropriate decisions can be made::
|
||||
be set to ``base`` or ``target`` so appropriate decisions can be made::
|
||||
|
||||
if [[ "$GRENADE_PHASE" == "work" ]]; then
|
||||
# Handle work-specific local
|
||||
if [[ "$GRENADE_PHASE" == "base" ]]; then
|
||||
# Handle base-specific local
|
||||
:
|
||||
else
|
||||
# Handle trunk-specific local
|
||||
# Handle target-specific local
|
||||
:
|
||||
fi
|
||||
|
||||
|
|
@ -90,19 +90,19 @@ Prepare For An Upgrade Test
|
|||
|
||||
./grenade.sh
|
||||
|
||||
``grenade.sh`` installs DevStack for the **Work** release (Folsom) and
|
||||
``grenade.sh`` installs DevStack for the **Base** release (Folsom) and
|
||||
runs its ``stack.sh``. Then it creates a 'javelin' project containing
|
||||
some non-default configuration.
|
||||
|
||||
This is roughly the equivalent to::
|
||||
|
||||
grenade/prep-work
|
||||
grenade/prep-base
|
||||
cd /opt/stack/devstack.essex
|
||||
./stack.sh
|
||||
grenade/setup-javelin
|
||||
./unstack.sh
|
||||
# dump databases to $DEST/save
|
||||
grenade/prep-trunk
|
||||
grenade/prep-target
|
||||
grenade/upgrade-packages
|
||||
grenade/upgrade-devstack
|
||||
grenade/upgrade-keystone
|
||||
|
|
@ -110,10 +110,10 @@ This is roughly the equivalent to::
|
|||
grenade/upgrade-nova
|
||||
grenade/upgrade-volume
|
||||
|
||||
The **Trunk** release (Grizzly) of DevStack is installed in a different
|
||||
directory from the **Work** release.
|
||||
The **Target** release (Grizzly) of DevStack is installed in a different
|
||||
directory from the **Base** release.
|
||||
|
||||
While the **Work** release is running an imaginary **Javelin** tenant
|
||||
While the **Base** release is running an imaginary **Javelin** tenant
|
||||
is configured to populate the databases with some non-default content::
|
||||
|
||||
grenade/setup-javelin
|
||||
|
|
|
|||
2
TODO.rst
2
TODO.rst
|
|
@ -6,7 +6,7 @@ ToDo
|
|||
Upgrade Scripts Needed
|
||||
======================
|
||||
|
||||
* ``upgrade-volume`` - present but unfinished
|
||||
* ``upgrade-volume`` - present but unfinishedvi dev
|
||||
* ``upgrade-swift``
|
||||
|
||||
Known Upgrade Failures
|
||||
|
|
|
|||
62
grenade.sh
62
grenade.sh
|
|
@ -132,22 +132,22 @@ set -o xtrace
|
|||
# ==========
|
||||
|
||||
# Set up for exercises
|
||||
WORK_RUN_EXERCISES=${WORK_RUN_EXERCISES:-RUN_EXERCISES}
|
||||
TRUNK_RUN_EXERCISES=${TRUNK_RUN_EXERCISES:-RUN_EXERCISES}
|
||||
BASE_RUN_EXERCISES=${BASE_RUN_EXERCISES:-RUN_EXERCISES}
|
||||
TARGET_RUN_EXERCISES=${TARGET_RUN_EXERCISES:-RUN_EXERCISES}
|
||||
|
||||
|
||||
# Install 'Work' Build of OpenStack
|
||||
# Install 'Base' Build of OpenStack
|
||||
# =================================
|
||||
|
||||
#echo_summary "Sourcing work DevStack config"
|
||||
#source $WORK_DEVSTACK_DIR/stackrc
|
||||
#echo_summary "Sourcing base DevStack config"
|
||||
#source $BASE_DEVSTACK_DIR/stackrc
|
||||
|
||||
echo_summary "Running prep-work"
|
||||
$GRENADE_DIR/prep-work
|
||||
stop $STOP prep-work 01
|
||||
echo_summary "Running prep-base"
|
||||
$GRENADE_DIR/prep-base
|
||||
stop $STOP prep-base 01
|
||||
|
||||
echo_summary "Running work stack.sh"
|
||||
cd $WORK_DEVSTACK_DIR
|
||||
echo_summary "Running base stack.sh"
|
||||
cd $BASE_DEVSTACK_DIR
|
||||
./stack.sh
|
||||
stop $STOP stack.sh 10
|
||||
|
||||
|
|
@ -159,11 +159,11 @@ mkdir -p $DEST/images
|
|||
echo "Images: $IMAGE_URLS"
|
||||
for image_url in ${IMAGE_URLS//,/ }; do
|
||||
IMAGE_FNAME=`basename "$image_url"`
|
||||
if [[ -r $WORK_DEVSTACK_DIR/files/$IMAGE_FNAME ]]; then
|
||||
rsync -av $WORK_DEVSTACK_DIR/files/$IMAGE_FNAME $DEST/images
|
||||
if [[ -r $BASE_DEVSTACK_DIR/files/$IMAGE_FNAME ]]; then
|
||||
rsync -av $BASE_DEVSTACK_DIR/files/$IMAGE_FNAME $DEST/images
|
||||
fi
|
||||
done
|
||||
rsync -av $WORK_DEVSTACK_DIR/files/images $DEST/images
|
||||
rsync -av $BASE_DEVSTACK_DIR/files/images $DEST/images
|
||||
stop $STOP image-cache 20
|
||||
|
||||
|
||||
|
|
@ -171,11 +171,11 @@ stop $STOP image-cache 20
|
|||
# ---------
|
||||
|
||||
# Validate the install
|
||||
echo_summary "Running work exercises"
|
||||
if [[ "$WORK_RUN_EXERCISES" == "True" ]]; then
|
||||
$WORK_DEVSTACK_DIR/exercise.sh
|
||||
echo_summary "Running base exercises"
|
||||
if [[ "$BASE_RUN_EXERCISES" == "True" ]]; then
|
||||
$BASE_DEVSTACK_DIR/exercise.sh
|
||||
fi
|
||||
stop $STOP work-exercise 110
|
||||
stop $STOP base-exercise 110
|
||||
|
||||
# Create a project, users and instances
|
||||
echo_summary "Creating Javelin project"
|
||||
|
|
@ -188,19 +188,19 @@ $GRENADE_DIR/save-state
|
|||
stop $STOP save-state 130
|
||||
|
||||
# Shut down running code
|
||||
echo_summary "Running work unstack.sh"
|
||||
$WORK_DEVSTACK_DIR/unstack.sh
|
||||
echo_summary "Running base unstack.sh"
|
||||
$BASE_DEVSTACK_DIR/unstack.sh
|
||||
stop $STOP unstack.sh 140
|
||||
|
||||
# Save databases
|
||||
# --------------
|
||||
|
||||
echo_summary "Sourcing work DevStack config"
|
||||
source $WORK_DEVSTACK_DIR/stackrc
|
||||
echo_summary "Dumping work databases"
|
||||
echo_summary "Sourcing base DevStack config"
|
||||
source $BASE_DEVSTACK_DIR/stackrc
|
||||
echo_summary "Dumping base databases"
|
||||
mkdir -p $SAVE_DIR
|
||||
for db in keystone glance nova; do
|
||||
mysqldump -uroot -p$MYSQL_PASSWORD $db >$SAVE_DIR/$db.sql.$START_RELEASE
|
||||
mysqldump -uroot -p$MYSQL_PASSWORD $db >$SAVE_DIR/$db.sql.$BASE_RELEASE
|
||||
done
|
||||
stop $STOP mysqldump 150
|
||||
|
||||
|
|
@ -208,10 +208,10 @@ stop $STOP mysqldump 150
|
|||
# Upgrades
|
||||
# ========
|
||||
|
||||
# Get trunk bits ready
|
||||
echo_summary "Running prep-trunk"
|
||||
$GRENADE_DIR/prep-trunk
|
||||
stop $STOP prep-trunk 210
|
||||
# Get target bits ready
|
||||
echo_summary "Running prep-target"
|
||||
$GRENADE_DIR/prep-target
|
||||
stop $STOP prep-target 210
|
||||
|
||||
# Upgrade OS packages and known Python updates
|
||||
echo_summary "Running upgrade-packages"
|
||||
|
|
@ -248,11 +248,11 @@ stop $STOP upgrade-volume 270
|
|||
# =============
|
||||
|
||||
# Validate the upgrade
|
||||
echo_summary "Running trunk exercises"
|
||||
if [[ "$TRUNK_RUN_EXERCISES" == "True" ]]; then
|
||||
$TRUNK_DEVSTACK_DIR/exercise.sh
|
||||
echo_summary "Running target exercises"
|
||||
if [[ "$TARGET_RUN_EXERCISES" == "True" ]]; then
|
||||
$TARGET_DEVSTACK_DIR/exercise.sh
|
||||
fi
|
||||
stop $STOP trunk-exercise 310
|
||||
stop $STOP target-exercise 310
|
||||
|
||||
|
||||
# Fin
|
||||
|
|
|
|||
20
grenaderc
20
grenaderc
|
|
@ -12,22 +12,22 @@ DEST=/opt/stack
|
|||
DATA_DIR=${DEST}/data
|
||||
|
||||
# Release info
|
||||
START_RELEASE=folsom
|
||||
FINAL_RELEASE=grizzly
|
||||
BASE_RELEASE=folsom
|
||||
TARGET_RELEASE=grizzly
|
||||
|
||||
# DevStack sources
|
||||
WORK_DEVSTACK_REPO=$GIT_BASE/openstack-dev/devstack.git
|
||||
WORK_DEVSTACK_BRANCH=stable/$START_RELEASE
|
||||
WORK_DEVSTACK_DIR=$DEST/devstack.$START_RELEASE
|
||||
BASE_DEVSTACK_REPO=$GIT_BASE/openstack-dev/devstack.git
|
||||
BASE_DEVSTACK_BRANCH=stable/$BASE_RELEASE
|
||||
BASE_DEVSTACK_DIR=$DEST/devstack.$BASE_RELEASE
|
||||
|
||||
TRUNK_DEVSTACK_REPO=$WORK_DEVSTACK_REPO
|
||||
TRUNK_DEVSTACK_BRANCH=master
|
||||
TRUNK_DEVSTACK_DIR=$DEST/devstack.$FINAL_RELEASE
|
||||
TARGET_DEVSTACK_REPO=$BASE_DEVSTACK_REPO
|
||||
TARGET_DEVSTACK_BRANCH=master
|
||||
TARGET_DEVSTACK_DIR=$DEST/devstack.$TARGET_RELEASE
|
||||
|
||||
# Allow skipping the exercises
|
||||
RUN_EXERCISES=True
|
||||
WORK_RUN_EXERCISES=${RUN_EXERCISES:=True}
|
||||
TRUNK_RUN_EXERCISES=${RUN_EXERCISES:=True}
|
||||
BASE_RUN_EXERCISES=${RUN_EXERCISES:=True}
|
||||
TARGET_RUN_EXERCISES=${RUN_EXERCISES:=True}
|
||||
|
||||
# Saved stuff
|
||||
SAVE_DIR=$DEST/save
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@ RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd)
|
|||
|
||||
source $RC_DIR/grenaderc
|
||||
source $RC_DIR/javelin.conf
|
||||
source $WORK_DEVSTACK_DIR/openrc $JUSER $JPROJECT
|
||||
source $BASE_DEVSTACK_DIR/openrc $JUSER $JPROJECT
|
||||
export OS_PASSWORD=$JPASSWORD
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# ``prep-work`` handles the preparations for installing and configuring
|
||||
# the "work" configuration of DevStack.
|
||||
# ``prep-base`` handles the preparations for installing and configuring
|
||||
# the "base" configuration of DevStack.
|
||||
|
||||
|
||||
# Keep track of the devstack directory
|
||||
|
|
@ -27,22 +27,22 @@ set -o xtrace
|
|||
|
||||
# perform cleanup to ensure a clean starting environment
|
||||
##add a config opt to still do this?
|
||||
##rm -rf $WORK_DEVSTACK_DIR
|
||||
##rm -rf $BASE_DEVSTACK_DIR
|
||||
|
||||
# Get DevStack if it doesn't exist
|
||||
if [[ ! -d $WORK_DEVSTACK_DIR ]]; then
|
||||
git_clone $WORK_DEVSTACK_REPO $WORK_DEVSTACK_DIR $WORK_DEVSTACK_BRANCH
|
||||
if [[ ! -d $BASE_DEVSTACK_DIR ]]; then
|
||||
git_clone $BASE_DEVSTACK_REPO $BASE_DEVSTACK_DIR $BASE_DEVSTACK_BRANCH
|
||||
fi
|
||||
|
||||
# Load up a copy of the downloaded images if not present
|
||||
if [[ -d $DEST/images ]]; then
|
||||
rsync -a $DEST/images/* $WORK_DEVSTACK_DIR/files
|
||||
rsync -a $DEST/images/* $BASE_DEVSTACK_DIR/files
|
||||
fi
|
||||
|
||||
# Set up work localrc
|
||||
if [[ ! -r $WORK_DEVSTACK_DIR/localrc ]]; then
|
||||
cat $GRENADE_DIR/devstack.localrc.work >$WORK_DEVSTACK_DIR/localrc
|
||||
# Set up base localrc
|
||||
if [[ ! -r $BASE_DEVSTACK_DIR/localrc ]]; then
|
||||
cat $GRENADE_DIR/devstack.localrc.base >$BASE_DEVSTACK_DIR/localrc
|
||||
if [[ -r $GRENADE_DIR/devstack.localrc ]]; then
|
||||
cat $GRENADE_DIR/devstack.localrc >>$WORK_DEVSTACK_DIR/localrc
|
||||
cat $GRENADE_DIR/devstack.localrc >>$BASE_DEVSTACK_DIR/localrc
|
||||
fi
|
||||
fi
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# ``prep-trunk`` handles the preparations for installing and configuring
|
||||
# the "trunk" configuration of DevStack.
|
||||
# ``prep-target`` handles the preparations for installing and configuring
|
||||
# the "target" configuration of DevStack.
|
||||
|
||||
|
||||
# Keep track of the devstack directory
|
||||
|
|
@ -27,31 +27,31 @@ set -o xtrace
|
|||
|
||||
# perform cleanup to ensure a clean starting environment
|
||||
##add a config opt to still do this?
|
||||
#rm -rf $TRUNK_DEVSTACK_DIR
|
||||
#rm -rf $TARGET_DEVSTACK_DIR
|
||||
|
||||
# Get DevStack if it doesn't exist
|
||||
if [[ ! -d $TRUNK_DEVSTACK_DIR ]]; then
|
||||
git_clone $TRUNK_DEVSTACK_REPO $TRUNK_DEVSTACK_DIR $TRUNK_DEVSTACK_BRANCH
|
||||
if [[ ! -d $TARGET_DEVSTACK_DIR ]]; then
|
||||
git_clone $TARGET_DEVSTACK_REPO $TARGET_DEVSTACK_DIR $TARGET_DEVSTACK_BRANCH
|
||||
fi
|
||||
|
||||
# Load up a copy of the downloaded images if not present
|
||||
if [[ -d $DEST/images ]]; then
|
||||
rsync -a $DEST/images/* $TRUNK_DEVSTACK_DIR/files
|
||||
rsync -a $DEST/images/* $TARGET_DEVSTACK_DIR/files
|
||||
fi
|
||||
|
||||
# Set up trunk localrc
|
||||
if [[ ! -r $TRUNK_DEVSTACK_DIR/localrc ]]; then
|
||||
cat $GRENADE_DIR/devstack.localrc.trunk >$TRUNK_DEVSTACK_DIR/localrc
|
||||
# Set up target localrc
|
||||
if [[ ! -r $TARGET_DEVSTACK_DIR/localrc ]]; then
|
||||
cat $GRENADE_DIR/devstack.localrc.target >$TARGET_DEVSTACK_DIR/localrc
|
||||
if [[ -r $GRENADE_DIR/devstack.localrc ]]; then
|
||||
cat $GRENADE_DIR/devstack.localrc >>$TRUNK_DEVSTACK_DIR/localrc
|
||||
cat $GRENADE_DIR/devstack.localrc >>$TARGET_DEVSTACK_DIR/localrc
|
||||
fi
|
||||
fi
|
||||
|
||||
# Set up Screen
|
||||
# =============
|
||||
|
||||
# Get trunk config
|
||||
source $TRUNK_DEVSTACK_DIR/stackrc
|
||||
# Get target config
|
||||
source $TARGET_DEVSTACK_DIR/stackrc
|
||||
|
||||
# Create a new named screen to run processes in
|
||||
screen -d -m -S $SCREEN_NAME -t shell -s /bin/bash
|
||||
|
|
@ -24,7 +24,7 @@ set -o xtrace
|
|||
# ======================
|
||||
|
||||
# Get DevStack Configuration
|
||||
source $WORK_DEVSTACK_DIR/openrc admin admin
|
||||
source $BASE_DEVSTACK_DIR/openrc admin admin
|
||||
|
||||
# Our configuration
|
||||
source $GRENADE_DIR/javelin.conf
|
||||
|
|
@ -59,7 +59,7 @@ keystone user-role-add --tenant_id $JAVELIN_TENANT \
|
|||
# Switch Identities
|
||||
# -----------------
|
||||
|
||||
source $WORK_DEVSTACK_DIR/openrc $JPROJECT $JUSER
|
||||
source $BASE_DEVSTACK_DIR/openrc $JPROJECT $JUSER
|
||||
export OS_PASSWORD=$JPASSWORD
|
||||
|
||||
|
||||
|
|
@ -70,7 +70,7 @@ export OS_PASSWORD=$JPASSWORD
|
|||
# Assumes DevStack.$START has already set this up
|
||||
BASE_NAME=0.3.0-x86_64
|
||||
CIRROS_IMAGE=cirros-${BASE_NAME}
|
||||
CIRROS_DIR=$WORK_DEVSTACK_DIR/files/images/$CIRROS_IMAGE-uec
|
||||
CIRROS_DIR=$BASE_DEVSTACK_DIR/files/images/$CIRROS_IMAGE-uec
|
||||
KERNEL=$CIRROS_DIR/$CIRROS_IMAGE-vmlinuz
|
||||
RAMDISK=$CIRROS_DIR/$CIRROS_IMAGE-initrd
|
||||
ROOTDISK=$CIRROS_DIR/$CIRROS_IMAGE-blank.img
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ set -o xtrace
|
|||
# Translate Services
|
||||
# ------------------
|
||||
|
||||
#WORK_ENABLED_SERVICES=$(source $WORK_DEVSTACK_DIR/stackrc; echo $ENABLED_SERVICES)
|
||||
#BASE_ENABLED_SERVICES=$(source $BASE_DEVSTACK_DIR/stackrc; echo $ENABLED_SERVICES)
|
||||
#ENABLED_SERVICES=""
|
||||
|
||||
# NOOP for now!
|
||||
|
||||
# Write new config to trunk DevStack
|
||||
#echo -e "\nENABLED_SERVICES=$ENABLED_SERVICES" >>$TRUNK_DEVSTACK_DIR/localrc
|
||||
# Write new config to target DevStack
|
||||
#echo -e "\nENABLED_SERVICES=$ENABLED_SERVICES" >>$TARGET_DEVSTACK_DIR/localrc
|
||||
|
||||
# Handle Defaults Changes
|
||||
# -----------------------
|
||||
|
|
|
|||
|
|
@ -53,14 +53,14 @@ for serv in g-api g-reg; do
|
|||
screen -S $SCREEN_NAME -p $serv -X kill
|
||||
done
|
||||
|
||||
# Duplicate some setup bits from trunk DevStack
|
||||
cd $TRUNK_DEVSTACK_DIR
|
||||
source $TRUNK_DEVSTACK_DIR/stackrc
|
||||
# Duplicate some setup bits from target DevStack
|
||||
cd $TARGET_DEVSTACK_DIR
|
||||
source $TARGET_DEVSTACK_DIR/stackrc
|
||||
SERVICE_HOST=${SERVICE_HOST:-localhost}
|
||||
S3_SERVICE_PORT=${S3_SERVICE_PORT:-8080}
|
||||
|
||||
# Get functions from current DevStack
|
||||
source $TRUNK_DEVSTACK_DIR/lib/glance
|
||||
source $TARGET_DEVSTACK_DIR/lib/glance
|
||||
|
||||
# install_glance()
|
||||
[[ -d $GLANCECLIENT_DIR ]] && sudo chown -R `whoami` $GLANCECLIENT_DIR
|
||||
|
|
@ -73,17 +73,17 @@ configure_glanceclient
|
|||
setup_develop $GLANCE_DIR
|
||||
|
||||
# Save original files and prepare to upgrade conf files
|
||||
[[ -r $GLANCE_REGISTRY_CONF.$START_RELEASE ]] || \
|
||||
cp -p $GLANCE_REGISTRY_CONF $GLANCE_REGISTRY_CONF.$START_RELEASE
|
||||
[[ -r $GLANCE_REGISTRY_CONF.$BASE_RELEASE ]] || \
|
||||
cp -p $GLANCE_REGISTRY_CONF $GLANCE_REGISTRY_CONF.$BASE_RELEASE
|
||||
|
||||
[[ -r $GLANCE_API_CONF.$START_RELEASE ]] || \
|
||||
cp -p $GLANCE_API_CONF $GLANCE_API_CONF.$START_RELEASE
|
||||
[[ -r $GLANCE_API_CONF.$BASE_RELEASE ]] || \
|
||||
cp -p $GLANCE_API_CONF $GLANCE_API_CONF.$BASE_RELEASE
|
||||
|
||||
[[ -r $GLANCE_REGISTRY_PASTE_INI.$START_RELEASE ]] || \
|
||||
cp -p $GLANCE_REGISTRY_PASTE_INI $GLANCE_REGISTRY_PASTE_INI.$START_RELEASE
|
||||
[[ -r $GLANCE_REGISTRY_PASTE_INI.$BASE_RELEASE ]] || \
|
||||
cp -p $GLANCE_REGISTRY_PASTE_INI $GLANCE_REGISTRY_PASTE_INI.$BASE_RELEASE
|
||||
|
||||
[[ -r $GLANCE_API_PASTE_INI.$START_RELEASE ]] || \
|
||||
cp -p $GLANCE_API_PASTE_INI $GLANCE_API_PASTE_INI.$START_RELEASE
|
||||
[[ -r $GLANCE_API_PASTE_INI.$BASE_RELEASE ]] || \
|
||||
cp -p $GLANCE_API_PASTE_INI $GLANCE_API_PASTE_INI.$BASE_RELEASE
|
||||
|
||||
# NOOP for now!
|
||||
|
||||
|
|
|
|||
|
|
@ -51,14 +51,14 @@ screen -S $SCREEN_NAME -p key -X kill
|
|||
|
||||
MYSQL_HOST=${MYSQL_HOST:-localhost}
|
||||
MYSQL_USER=${MYSQL_USER:-root}
|
||||
BASE_SQL_CONN=$(source $WORK_DEVSTACK_DIR/stackrc; echo ${BASE_SQL_CONN:-mysql://$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST})
|
||||
BASE_SQL_CONN=$(source $BASE_DEVSTACK_DIR/stackrc; echo ${BASE_SQL_CONN:-mysql://$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST})
|
||||
|
||||
# Duplicate some setup bits from trunk DevStack
|
||||
cd $TRUNK_DEVSTACK_DIR
|
||||
source $TRUNK_DEVSTACK_DIR/stackrc
|
||||
# Duplicate some setup bits from target DevStack
|
||||
cd $TARGET_DEVSTACK_DIR
|
||||
source $TARGET_DEVSTACK_DIR/stackrc
|
||||
SERVICE_HOST=${SERVICE_HOST:-localhost}
|
||||
S3_SERVICE_PORT=${S3_SERVICE_PORT:-8080}
|
||||
source $TRUNK_DEVSTACK_DIR/lib/keystone
|
||||
source $TARGET_DEVSTACK_DIR/lib/keystone
|
||||
|
||||
# install_keystone()
|
||||
sudo chown -R `whoami` $KEYSTONECLIENT_DIR $KEYSTONE_DIR
|
||||
|
|
@ -70,7 +70,7 @@ configure_keystoneclient
|
|||
setup_develop $KEYSTONE_DIR
|
||||
|
||||
# Save current conf file for some reason...
|
||||
[[ -r $KEYSTONE_CONF.$START_RELEASE ]] || cp -p $KEYSTONE_CONF $KEYSTONE_CONF.$START_RELEASE
|
||||
[[ -r $KEYSTONE_CONF.$BASE_RELEASE ]] || cp -p $KEYSTONE_CONF $KEYSTONE_CONF.$BASE_RELEASE
|
||||
|
||||
# NOOP for now!
|
||||
|
||||
|
|
|
|||
14
upgrade-nova
14
upgrade-nova
|
|
@ -56,14 +56,14 @@ QUANTUM_DIR=$DEST/quantum
|
|||
|
||||
SYSLOG=`trueorfalse False $SYSLOG`
|
||||
|
||||
# Duplicate some setup bits from trunk DevStack
|
||||
cd $TRUNK_DEVSTACK_DIR
|
||||
source $TRUNK_DEVSTACK_DIR/stackrc
|
||||
# Duplicate some setup bits from target DevStack
|
||||
cd $TARGET_DEVSTACK_DIR
|
||||
source $TARGET_DEVSTACK_DIR/stackrc
|
||||
SERVICE_HOST=${SERVICE_HOST:-localhost}
|
||||
S3_SERVICE_PORT=${S3_SERVICE_PORT:-8080}
|
||||
|
||||
# Get functions from current DevStack
|
||||
source $TRUNK_DEVSTACK_DIR/lib/nova
|
||||
source $TARGET_DEVSTACK_DIR/lib/nova
|
||||
|
||||
NOVNC_DIR=$DEST/noVNC
|
||||
|
||||
|
|
@ -88,9 +88,9 @@ setup_develop $NOVA_DIR
|
|||
# Normally created from scratch on each run if ``stack.sh``
|
||||
# Until we can call that without duplicating the code just convert the old one
|
||||
|
||||
[[ -r $NOVA_CONF.$START_RELEASE ]] || \
|
||||
cp -p $NOVA_CONF $NOVA_CONF.$START_RELEASE
|
||||
#cp -p $NOVA_CONF.$START_RELEASE $NOVA_CONF
|
||||
[[ -r $NOVA_CONF.$BASE_RELEASE ]] || \
|
||||
cp -p $NOVA_CONF $NOVA_CONF.$BASE_RELEASE
|
||||
#cp -p $NOVA_CONF.$BASE_RELEASE $NOVA_CONF
|
||||
|
||||
# NOOP for now!
|
||||
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@ PIPS="$GLANCE_PIPS $HORIZON_PIPS $NOVA_PIPS $QUANTUM_PIPS"
|
|||
|
||||
# Install package requirements
|
||||
if [[ "$os_PACKAGE" = "deb" ]]; then
|
||||
install_package $(get_packages $TRUNK_DEVSTACK_DIR/files/apts)
|
||||
install_package $(get_packages $TARGET_DEVSTACK_DIR/files/apts)
|
||||
else
|
||||
install_package $(get_packages $TRUNK_DEVSTACK_DIR/files/rpms)
|
||||
install_package $(get_packages $TARGET_DEVSTACK_DIR/files/rpms)
|
||||
fi
|
||||
|
||||
# Restart Services
|
||||
|
|
|
|||
|
|
@ -53,14 +53,14 @@ set -o xtrace
|
|||
|
||||
DATA_DIR=${DATA_DIR:-${DEST}/data}
|
||||
|
||||
cd $TRUNK_DEVSTACK_DIR
|
||||
source $TRUNK_DEVSTACK_DIR/stackrc
|
||||
cd $TARGET_DEVSTACK_DIR
|
||||
source $TARGET_DEVSTACK_DIR/stackrc
|
||||
|
||||
SERVICE_HOST=${SERVICE_HOST:-localhost}
|
||||
SERVICE_TENANT_NAME=${SERVICE_TENANT_NAME:-service}
|
||||
source $TRUNK_DEVSTACK_DIR/lib/keystone
|
||||
source $TRUNK_DEVSTACK_DIR/lib/nova
|
||||
source $TRUNK_DEVSTACK_DIR/lib/cinder
|
||||
source $TARGET_DEVSTACK_DIR/lib/keystone
|
||||
source $TARGET_DEVSTACK_DIR/lib/nova
|
||||
source $TARGET_DEVSTACK_DIR/lib/cinder
|
||||
|
||||
# Kill any running daemons
|
||||
#stop_cinder
|
||||
|
|
@ -75,7 +75,7 @@ done
|
|||
|
||||
MYSQL_HOST=${MYSQL_HOST:-localhost}
|
||||
MYSQL_USER=${MYSQL_USER:-root}
|
||||
BASE_SQL_CONN=$(source $WORK_DEVSTACK_DIR/stackrc; echo ${BASE_SQL_CONN:-mysql://$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST})
|
||||
BASE_SQL_CONN=$(source $BASE_DEVSTACK_DIR/stackrc; echo ${BASE_SQL_CONN:-mysql://$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST})
|
||||
|
||||
install_cinder
|
||||
setup_develop $CINDER_DIR
|
||||
|
|
|
|||
Loading…
Reference in New Issue