From a9e1c486d93630a7f1f19ec79b968ba5404bde0e Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 28 Dec 2017 11:45:22 +0000 Subject: xci: nfvi: OSA: Remove duplicate xci-deploy.sh script It was committed by accident in c74cfd33fc3c ("xci: OSA: Move all the OSA specific playbooks to the NFVI directory") so drop it. Change-Id: I5de91f0aad750a9cb723a46baa63e75beb3180de Signed-off-by: Markos Chandras --- xci/nfvi/osa/playbooks/xci-deploy.sh | 183 ----------------------------------- 1 file changed, 183 deletions(-) delete mode 100755 xci/nfvi/osa/playbooks/xci-deploy.sh diff --git a/xci/nfvi/osa/playbooks/xci-deploy.sh b/xci/nfvi/osa/playbooks/xci-deploy.sh deleted file mode 100755 index 89fb455b..00000000 --- a/xci/nfvi/osa/playbooks/xci-deploy.sh +++ /dev/null @@ -1,183 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -submit_bug_report() { - cd ${XCI_PATH} - echo "" - echo "-------------------------------------------------------------------------" - echo "Oh nooooo! The XCI deployment failed miserably :-(" - echo "" - echo "If you need help, please choose one of the following options" - echo "* #opnfv-pharos @ freenode network" - echo "* opnfv-tech-discuss mailing list (https://lists.opnfv.org/mailman/listinfo/opnfv-tech-discuss)" - echo " - Please prefix the subject with [XCI]" - echo "* https://jira.opnfv.org (Release Engineering project)" - echo "" - echo "Do not forget to submit the following information on your bug report:" - echo "" - git diff --quiet && echo "releng-xci tree status: clean" || echo "releng-xci tree status: local modifications" - echo "opnfv/releng-xci version: $(git rev-parse HEAD)" - echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION" - echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION" - echo "xci flavor: $XCI_FLAVOR" - echo "xci nfvi: $XCI_NFVI" - echo "Environment variables:" - env | grep --color=never '\(OPNFV\|XCI\|OPENSTACK\)' - echo "-------------------------------------------------------------------------" -} - -#------------------------------------------------------------------------------- -# This script should not be run as root -#------------------------------------------------------------------------------- -if [[ $(whoami) == "root" ]]; then - echo "WARNING: This script should not be run as root!" - echo "Elevated privileges are aquired automatically when necessary" - echo "Waiting 10s to give you a chance to stop the script (Ctrl-C)" - for x in $(seq 10 -1 1); do echo -n "$x..."; sleep 1; done -fi - -#------------------------------------------------------------------------------- -# Set environment variables -#------------------------------------------------------------------------------- -# The order of sourcing the variable files is significant so please do not -# change it or things might stop working. -# - user-vars: variables that can be configured or overriden by user. -# - pinned-versions: versions to checkout. These can be overriden if you want to -# use different/more recent versions of the tools but you might end up using -# something that is not verified by OPNFV XCI. -# - flavor-vars: settings for VM nodes for the chosen flavor. -# - env-vars: variables for the xci itself and you should not need to change or -# override any of them. -#------------------------------------------------------------------------------- -# find where are we -export XCI_PATH="$(git rev-parse --show-toplevel)" -# source user vars -source $XCI_PATH/xci/config/user-vars -# source pinned versions -source $XCI_PATH/xci/config/pinned-versions -# source flavor configuration -source "$XCI_PATH/xci/config/${XCI_FLAVOR}-vars" -# source NFVI configuration -source "$XCI_PATH/xci/nfvi/${XCI_NFVI}/env" &>/dev/null || true -# source xci configuration -source $XCI_PATH/xci/config/env-vars - -if [[ -z $(echo $PATH | grep "$HOME/.local/bin") ]]; then - export PATH="$HOME/.local/bin:$PATH" -fi - -#------------------------------------------------------------------------------- -# Sanitize local development environment variables -#------------------------------------------------------------------------------- -user_local_dev_vars=(OPENSTACK_OSA_DEV_PATH OPENSTACK_BIFROST_DEV_PATH) -for local_user_var in ${user_local_dev_vars[@]}; do - [[ -n ${!local_user_var:-} ]] && export $local_user_var=${!local_user_var%/}/ -done -unset user_local_dev_vars local_user_var - -# register our handler -trap submit_bug_report ERR - -#------------------------------------------------------------------------------- -# Log info to console -#------------------------------------------------------------------------------- -echo "Info: Starting XCI Deployment" -echo "Info: Deployment parameters" -echo "-------------------------------------------------------------------------" -echo "xci flavor: $XCI_FLAVOR" -echo "xci nfvi: $XCI_NFVI" -echo "opnfv/releng-xci version: $(git rev-parse HEAD)" -echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION" -echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION" -echo "OPNFV scenario: $DEPLOY_SCENARIO" -echo "-------------------------------------------------------------------------" - -#------------------------------------------------------------------------------- -# Install ansible on localhost -#------------------------------------------------------------------------------- -echo "Info: Installing Ansible from pip" -echo "-------------------------------------------------------------------------" -source file/install-ansible.sh -echo "-------------------------------------------------------------------------" - -# Make the VMs match the host. If we need to make this configurable -# then this logic has to be moved outside this file -case ${OS_FAMILY,,} in - # These should ideally match the CI jobs - debian) - export DIB_OS_RELEASE="${DIB_OS_RELEASE:-xenial}" - export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-ubuntu-minimal}" - export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl,iptables}" - ;; - redhat) - export DIB_OS_RELEASE="${DIB_OS_RELEASE:-7}" - export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-centos-minimal}" - export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vim,less,bridge-utils,iputils,rsyslog,curl,iptables}" - ;; - suse) - export DIB_OS_RELEASE="${DIB_OS_RELEASE:-42.3}" - export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-opensuse-minimal}" - export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vim,less,bridge-utils,iputils,rsyslog,curl,iptables}" - ;; -esac - -# There is no CentOS support at all -if [[ $OS_FAMILY == RedHat ]]; then - echo "" - echo "Error: Sorry, only Ubuntu and SUSE hosts are supported for now!" - echo "Error: CentOS 7 support is still work in progress." - echo "" - exit 1 -fi - -# Clone OPNFV scenario repositories -#------------------------------------------------------------------------------- -# This playbook -# - removes existing scenario roles -# - clones OPNFV scenario roles based on the file/opnfv-scenario-requirements.yml file -#------------------------------------------------------------------------------- -echo "Info: Cloning OPNFV scenario repositories" -echo "-------------------------------------------------------------------------" -cd $XCI_PATH/xci/playbooks -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i inventory get-opnfv-scenario-requirements.yml -echo "-------------------------------------------------------------------------" - -#------------------------------------------------------------------------------- -# Get scenario variables overrides -#------------------------------------------------------------------------------- -if [[ -f $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO:-_no_scenario_}/xci_overrides ]]; then - source $XCI_SCENARIOS_CACHE/$DEPLOY_SCENARIO/xci_overrides -fi - -#------------------------------------------------------------------------------- -# Start provisioning VM nodes -#------------------------------------------------------------------------------- -# This playbook -# - removes directories that were created by the previous xci run -# - clones opnfv/releng-xci and openstack/bifrost repositories -# - combines opnfv/releng-xci and openstack/bifrost scripts/playbooks -# - destroys VMs, removes ironic db, leases, logs -# - creates and provisions VMs for the chosen flavor -#------------------------------------------------------------------------------- -echo "Info: Starting provisining VM nodes using openstack/bifrost" -echo "-------------------------------------------------------------------------" -# We are using sudo so we need to make sure that env_reset is not present -sudo sed -i "s/^Defaults.*env_reset/#&/" /etc/sudoers -cd $XCI_PATH/bifrost/ -sudo -E bash ./scripts/destroy-env.sh -cd $XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i inventory provision-vm-nodes.yml -cd ${XCI_CACHE}/repos/bifrost -bash ./scripts/bifrost-provision.sh -echo "-----------------------------------------------------------------------" -echo "Info: VM nodes are provisioned!" -echo "-----------------------------------------------------------------------" - -# Deploy OpenStack on the selected NFVI -echo "Info: Deploying '${XCI_NFVI}' NFVI" -echo "-----------------------------------------------------------------------" -source ${XCI_PATH}/xci/nfvi/${XCI_NFVI}/nfvi-deploy.sh - -# vim: set ts=4 sw=4 expandtab: -- cgit 1.2.3-korg