Introduce upgrade testing with Grenade
This change makes it possible to run Grenade jobs on ironic-inspector. The only thing tested in this patch is that ironic-inspector actually comes up after upgrade from a previous version. We will make it run actual introspection tests in the next patch. Co-Authored-By: Dmitry Tantsur <dtantsur@redhat.com> Change-Id: I79e7ecaa89936144b63a72baf8460ae6ad139890
This commit is contained in:
dparalen
Dmitry Tantsur
parent
a8cb6bf838
commit
99c81d9c60
|
|
@ -0,0 +1,77 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Copyright 2015 Hewlett-Packard Development Company, L.P.
|
||||
# Copyright 2016 Intel Corporation
|
||||
# Copyright 2016 Red Hat, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
## based on Ironic/devstack/upgrade/resources.sh
|
||||
|
||||
set -o errexit
|
||||
|
||||
source $GRENADE_DIR/grenaderc
|
||||
source $GRENADE_DIR/functions
|
||||
|
||||
source $TOP_DIR/openrc admin admin
|
||||
|
||||
# Inspector relies on a couple of Ironic variables
|
||||
source $TARGET_RELEASE_DIR/ironic/devstack/lib/ironic
|
||||
|
||||
INSPECTOR_DEVSTACK_DIR=$(cd $(dirname "$0")/.. && pwd)
|
||||
source $INSPECTOR_DEVSTACK_DIR/plugin.sh
|
||||
|
||||
set -o xtrace
|
||||
|
||||
|
||||
function early_create {
|
||||
:
|
||||
}
|
||||
|
||||
function create {
|
||||
:
|
||||
}
|
||||
|
||||
function verify {
|
||||
:
|
||||
}
|
||||
|
||||
function verify_noapi {
|
||||
:
|
||||
}
|
||||
|
||||
function destroy {
|
||||
:
|
||||
}
|
||||
|
||||
# Dispatcher
|
||||
case $1 in
|
||||
"early_create")
|
||||
early_create
|
||||
;;
|
||||
"create")
|
||||
create
|
||||
;;
|
||||
"verify_noapi")
|
||||
verify_noapi
|
||||
;;
|
||||
"verify")
|
||||
verify
|
||||
;;
|
||||
"destroy")
|
||||
destroy
|
||||
;;
|
||||
"force_destroy")
|
||||
set +o errexit
|
||||
destroy
|
||||
;;
|
||||
esac
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
# Enabling Inspector grenade plug-in
|
||||
# Based on Ironic/devstack/grenade/settings
|
||||
register_project_for_upgrade ironic-inspector
|
||||
register_db_to_save ironic_inspector
|
||||
|
||||
# Inspector plugin and service registration
|
||||
devstack_localrc base enable_plugin ironic-inspector https://github.com/openstack/ironic-inspector
|
||||
devstack_localrc base enable_service ironic-inspector ironic-inspector-dhcp
|
||||
|
||||
devstack_localrc target enable_plugin ironic-inspector https://github.com/openstack/ironic-inspector
|
||||
devstack_localrc target enable_service ironic-inspector ironic-inspector-dhcp
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# based on Ironic/devstack/upgrade/shutdown.sh
|
||||
|
||||
set -o errexit
|
||||
|
||||
source $GRENADE_DIR/grenaderc
|
||||
source $GRENADE_DIR/functions
|
||||
|
||||
# We need base DevStack functions for this
|
||||
source $BASE_DEVSTACK_DIR/functions
|
||||
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
|
||||
source $BASE_DEVSTACK_DIR/lib/tls
|
||||
source $BASE_DEVSTACK_DIR/lib/apache
|
||||
|
||||
# Inspector relies on a couple of Ironic variables
|
||||
source $TARGET_RELEASE_DIR/ironic/devstack/lib/ironic
|
||||
|
||||
# Keep track of the DevStack directory
|
||||
INSPECTOR_DEVSTACK_DIR=$(cd $(dirname "$0")/.. && pwd)
|
||||
source $INSPECTOR_DEVSTACK_DIR/plugin.sh
|
||||
|
||||
|
||||
set -o xtrace
|
||||
|
||||
stop_inspector
|
||||
if [[ "$IRONIC_INSPECTOR_MANAGE_FIREWALL" == "True" ]]; then
|
||||
stop_inspector_dhcp
|
||||
fi
|
||||
|
|
@ -0,0 +1,136 @@
|
|||
#!/usr/bin/env bash
|
||||
## based on Ironic/devstack/upgrade/upgrade.sh
|
||||
|
||||
# ``upgrade-inspector``
|
||||
|
||||
echo "*********************************************************************"
|
||||
echo "Begin $0"
|
||||
echo "*********************************************************************"
|
||||
|
||||
# Clean up any resources that may be in use
|
||||
cleanup() {
|
||||
set +o errexit
|
||||
|
||||
echo "*********************************************************************"
|
||||
echo "ERROR: Abort $0"
|
||||
echo "*********************************************************************"
|
||||
|
||||
# Kill ourselves to signal any calling process
|
||||
trap 2; kill -2 $$
|
||||
}
|
||||
|
||||
trap cleanup SIGHUP SIGINT SIGTERM
|
||||
|
||||
# Keep track of the grenade directory
|
||||
RUN_DIR=$(cd $(dirname "$0") && pwd)
|
||||
|
||||
# Source params
|
||||
source $GRENADE_DIR/grenaderc
|
||||
|
||||
# Import common functions
|
||||
source $GRENADE_DIR/functions
|
||||
|
||||
# This script exits on an error so that errors don't compound and you see
|
||||
# only the first error that occurred.
|
||||
set -o errexit
|
||||
|
||||
# Upgrade Inspector
|
||||
# =================
|
||||
|
||||
# Duplicate some setup bits from target DevStack
|
||||
source $TARGET_DEVSTACK_DIR/stackrc
|
||||
source $TARGET_DEVSTACK_DIR/lib/tls
|
||||
source $TARGET_DEVSTACK_DIR/lib/nova
|
||||
source $TARGET_DEVSTACK_DIR/lib/neutron-legacy
|
||||
source $TARGET_DEVSTACK_DIR/lib/apache
|
||||
source $TARGET_DEVSTACK_DIR/lib/keystone
|
||||
source $TARGET_DEVSTACK_DIR/lib/database
|
||||
|
||||
# Inspector relies on couple of Ironic variables
|
||||
source $TARGET_RELEASE_DIR/ironic/devstack/lib/ironic
|
||||
|
||||
# Keep track of the DevStack directory
|
||||
INSPECTOR_DEVSTACK_DIR=$(cd $(dirname "$0")/.. && pwd)
|
||||
INSPECTOR_PLUGIN=$INSPECTOR_DEVSTACK_DIR/plugin.sh
|
||||
source $INSPECTOR_PLUGIN
|
||||
|
||||
# Print the commands being run so that we can see the command that triggers
|
||||
# an error. It is also useful for following allowing as the install occurs.
|
||||
set -o xtrace
|
||||
|
||||
initialize_database_backends
|
||||
|
||||
function is_nova_migration {
|
||||
# Determine whether we're "upgrading" from another compute driver
|
||||
_ironic_old_driver=$(source $BASE_DEVSTACK_DIR/functions; source $BASE_DEVSTACK_DIR/localrc; echo $VIRT_DRIVER)
|
||||
[ "$_ironic_old_driver" != "ironic" ]
|
||||
}
|
||||
|
||||
# Duplicate all required devstack setup that is needed before starting
|
||||
# Inspector during a sideways upgrade, where we are migrating from an
|
||||
# devstack environment without Inspector.
|
||||
function init_inspector {
|
||||
# We need to source credentials here but doing so in the gate will unset
|
||||
# HOST_IP.
|
||||
local tmp_host_ip=$HOST_IP
|
||||
source $TARGET_DEVSTACK_DIR/openrc admin admin
|
||||
HOST_IP=$tmp_host_ip
|
||||
IRONIC_BAREMETAL_BASIC_OPS="True"
|
||||
$TARGET_DEVSTACK_DIR/tools/install_prereqs.sh
|
||||
recreate_database ironic_inspector utf8
|
||||
$INSPECTOR_PLUGIN stack install
|
||||
$INSPECTOR_PLUGIN stack post-config
|
||||
$INSPECTOR_PLUGIN stack extra
|
||||
}
|
||||
|
||||
function wait_for_keystone {
|
||||
if ! wait_for_service $SERVICE_TIMEOUT ${KEYSTONE_AUTH_URI}/v$IDENTITY_API_VERSION/; then
|
||||
die $LINENO "keystone did not start"
|
||||
fi
|
||||
}
|
||||
|
||||
# Save current config files for posterity
|
||||
if [[ -d $IRONIC_INSPECTOR_CONF_DIR ]] && [[ ! -d $SAVE_DIR/etc.inspector ]] ; then
|
||||
cp -pr $IRONIC_INSPECTOR_CONF_DIR $SAVE_DIR/etc.inspector
|
||||
fi
|
||||
|
||||
stack_install_service ironic-inspector
|
||||
|
||||
if [[ "$IRONIC_INSPECTOR_MANAGE_FIREWALL" == "True" ]]; then
|
||||
stack_install_service ironic-inspector-dhcp
|
||||
fi
|
||||
|
||||
|
||||
# FIXME(milan): using Ironic's detection; not sure whether it's needed
|
||||
# If we are sideways upgrading and migrating from a base deployed with
|
||||
# VIRT_DRIVER=fake, we need to run Inspector install, config and init
|
||||
# code from devstack.
|
||||
if is_nova_migration ; then
|
||||
init_inspector
|
||||
fi
|
||||
|
||||
sync_inspector_database
|
||||
|
||||
# calls upgrade inspector for specific release
|
||||
upgrade_project ironic-inspector $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH
|
||||
|
||||
|
||||
start_inspector
|
||||
|
||||
if [[ "$IRONIC_INSPECTOR_MANAGE_FIREWALL" == "True" ]]; then
|
||||
start_inspector_dhcp
|
||||
fi
|
||||
|
||||
# Don't succeed unless the services come up
|
||||
ensure_services_started ironic-inspector
|
||||
ensure_logs_exist ironic-inspector
|
||||
|
||||
if [[ "$IRONIC_INSPECTOR_MANAGE_FIREWALL" == "True" ]]; then
|
||||
ensure_services_started dnsmasq
|
||||
ensure_logs_exist ironic-inspector-dhcp
|
||||
fi
|
||||
|
||||
set +o xtrace
|
||||
echo "*********************************************************************"
|
||||
echo "SUCCESS: End $0"
|
||||
echo "*********************************************************************"
|
||||
Loading…
Reference in New Issue