summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbifrost/scripts/destroy-env.sh19
-rwxr-xr-xxci/config/env-vars2
-rwxr-xr-xxci/config/user-vars6
-rw-r--r--xci/installer/kubespray/README2
-rw-r--r--xci/installer/kubespray/playbooks/configure-opnfvhost.yml2
-rw-r--r--xci/installer/osa/playbooks/configure-opnfvhost.yml5
-rw-r--r--xci/playbooks/configure-localhost.yml12
-rw-r--r--xci/playbooks/get-opnfv-scenario-requirements.yml4
-rw-r--r--xci/var/Debian.yml2
-rw-r--r--xci/var/RedHat.yml2
-rw-r--r--xci/var/Suse.yml2
-rw-r--r--xci/var/opnfv.yml2
-rwxr-xr-xxci/xci-deploy.sh12
13 files changed, 32 insertions, 40 deletions
diff --git a/bifrost/scripts/destroy-env.sh b/bifrost/scripts/destroy-env.sh
index 97638303..73c0222b 100755
--- a/bifrost/scripts/destroy-env.sh
+++ b/bifrost/scripts/destroy-env.sh
@@ -18,18 +18,19 @@ fi
rm -rf /opt/stack
# HOME is normally set by sudo -H
rm -rf ${HOME}/.config/openstack
+rm -rf ${HOME}/.ansible
# bifrost installs everything on venv so we need to look there if virtualbmc is not installed on the host.
if which vbmc &>/dev/null || { [[ -e /opt/stack/bifrost/bin/activate ]] && source /opt/stack/bifrost/bin/activate; }; then
- # Delete all libvirt VMs and hosts from vbmc (look for a port number)
- for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do
- if which virsh &>/dev/null; then
- virsh destroy $vm || true
- virsh undefine $vm || true
- fi
- vbmc delete $vm
- done
- which vbmc &>/dev/null || { [[ -e /opt/stack/bifrost/bin/activate ]] && deactivate; }
+ # Delete all libvirt VMs and hosts from vbmc (look for a port number)
+ for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do
+ if which virsh &>/dev/null; then
+ virsh destroy $vm || true
+ virsh undefine $vm || true
+ fi
+ vbmc delete $vm
+ done
+ which vbmc &>/dev/null || { [[ -e /opt/stack/bifrost/bin/activate ]] && deactivate; }
fi
# Destroy all XCI VMs if the previous operation failed
diff --git a/xci/config/env-vars b/xci/config/env-vars
index 04c10c0e..914224ca 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -15,7 +15,7 @@ export KEEPALIVED_GIT_URL=${KEEPALIVED_GIT_URL:-https://github.com/evrardjp/ansi
# Configuration
export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy
export OPNFV_HOST_IP=192.168.122.2
-export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/installer/$XCI_INSTALLER/files/$XCI_FLAVOR
+export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/installer/$INSTALLER_TYPE/files/$XCI_FLAVOR
export CI_LOOP=${CI_LOOP:-daily}
export JOB_NAME=${JOB_NAME:-false}
# XCI_CACHE is a cache on localhost where repositories and scenarios are cloned.
diff --git a/xci/config/user-vars b/xci/config/user-vars
index 0624eb84..c3b11e8e 100755
--- a/xci/config/user-vars
+++ b/xci/config/user-vars
@@ -29,10 +29,10 @@ export XCI_CEPH_ENABLED=${XCI_CEPH_ENABLED:-false}
#-------------------------------------------------------------------------------
# Currently, there are two kinds of installers in XCI: osa and kubespray
# Examples:
-# export XCI_INSTALLER="osa"
+# export INSTALLER_TYPE="osa"
# or
-# export XCI_INSTALLER="kubespray"
-export XCI_INSTALLER=${XCI_INSTALLER:-osa}
+# export INSTALLER_TYPE="kubespray"
+export INSTALLER_TYPE=${INSTALLER_TYPE:-osa}
#-------------------------------------------------------------------------------
# Configure some other stuff
diff --git a/xci/installer/kubespray/README b/xci/installer/kubespray/README
index 171091e8..04202c28 100644
--- a/xci/installer/kubespray/README
+++ b/xci/installer/kubespray/README
@@ -55,7 +55,7 @@ Change into the directory where the sandbox script is located
Set the variable to run kubespray
- export XCI_INSTALLER=kubespray
+ export INSTALLER_TYPE=kubespray
export DEPLOY_SCENARIO=k8-nosdn-nofeature
export XCI_FLAVOR=mini
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
index 9fb4da19..4db9ac1a 100644
--- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
@@ -20,7 +20,7 @@
- name: Set facts for remote deployment
set_fact:
remote_xci_path: "{{ ansible_env.HOME }}/releng-xci"
- remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/installer/{{ XCI_INSTALLER }}/files/{{ XCI_FLAVOR }}"
+ remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/installer/{{ INSTALLER_TYPE }}/files/{{ XCI_FLAVOR }}"
remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks"
- name: Copy releng-xci to remote host
diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index 2996236b..a3b8894f 100644
--- a/xci/installer/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml
@@ -23,7 +23,7 @@
- name: Set facts for remote deployment
set_fact:
remote_xci_path: "{{ ansible_env.HOME }}/releng-xci"
- remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/installer/{{XCI_INSTALLER}}/files/{{ XCI_FLAVOR }}"
+ remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/installer/{{INSTALLER_TYPE}}/files/{{ XCI_FLAVOR }}"
remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks"
roles:
@@ -101,9 +101,6 @@
command: "/bin/bash ./scripts/bootstrap-ansible.sh"
args:
chdir: "{{OPENSTACK_OSA_PATH}}"
- - name: install python Crypto module
- package:
- name: "{{ python_crypto_package_name }}"
- name: install opnfv pip required packages
pip:
name: "{{ item }}"
diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml
index 467ab312..a5b0e3fa 100644
--- a/xci/playbooks/configure-localhost.yml
+++ b/xci/playbooks/configure-localhost.yml
@@ -35,33 +35,33 @@
repo: "{{ OPENSTACK_OSA_OPENRC_GIT_URL }}"
dest: roles/openstack-ansible-openstack_openrc
version: "master"
- when: XCI_INSTALLER == "osa"
+ when: INSTALLER_TYPE == "osa"
- role: clone-repository
project: "openstack/openstack-ansible"
repo: "{{ OPENSTACK_OSA_GIT_URL }}"
dest: "{{ XCI_CACHE }}/repos/openstack-ansible"
version: "{{ OPENSTACK_OSA_VERSION }}"
- when: XCI_INSTALLER == "osa"
+ when: INSTALLER_TYPE == "osa"
- role: clone-repository
project: "kubernetes-incubator/kubespray"
repo: "{{ KUBESPRAY_GIT_URL }}"
dest: "{{ XCI_CACHE }}/repos/kubespray"
version: "{{ KUBESPRAY_VERSION }}"
- when: XCI_INSTALLER == "kubespray"
+ when: INSTALLER_TYPE == "kubespray"
- role: clone-repository
project: "openstack/openstack-ansible-haproxy_server"
repo: "{{ OPENSTACK_OSA_HAPROXY_GIT_URL }}"
dest: roles/haproxy_server
version: "{{ HAPROXY_VERSION }}"
when:
- - XCI_INSTALLER == "kubespray"
+ - INSTALLER_TYPE == "kubespray"
- role: clone-repository
project: "ansible-keepalived"
repo: "{{ KEEPALIVED_GIT_URL }}"
dest: roles/keepalived
version: "{{ KEEPALIVED_VERSION }}"
when:
- - XCI_INSTALLER == "kubespray"
+ - INSTALLER_TYPE == "kubespray"
tasks:
- name: create log directory {{LOG_PATH}}
@@ -97,4 +97,4 @@
when:
- OPENSTACK_OSA_DEV_PATH != ""
when:
- - XCI_INSTALLER == "osa"
+ - INSTALLER_TYPE == "osa"
diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml
index c04348e3..0615fde1 100644
--- a/xci/playbooks/get-opnfv-scenario-requirements.yml
+++ b/xci/playbooks/get-opnfv-scenario-requirements.yml
@@ -110,7 +110,7 @@
with_items: "{{ deploy_scenario.installers }}"
loop_control:
label: "{{ item.installer }}"
- when: item.installer == XCI_INSTALLER
+ when: item.installer == INSTALLER_TYPE
- set_fact:
deploy_scenario_flavor: "{{ (XCI_FLAVOR in deploy_scenario_installer.flavors) | bool }}"
when:
@@ -128,7 +128,7 @@
msg:
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ERROR! The {{ DEPLOY_SCENARIO }} scenario can't be deployed. This is because
- - the {{ XCI_INSTALLER }} XCI installer or the {{ XCI_FLAVOR }} flavor or the {{ XCI_DISTRO }}
+ - the {{ INSTALLER_TYPE }} XCI installer or the {{ XCI_FLAVOR }} flavor or the {{ XCI_DISTRO }}
- distribution is not supported by this scenario. It may also be possible that
- this scenario doesn't exist at all or it's not listed in {{ scenario_file }}.
- ''
diff --git a/xci/var/Debian.yml b/xci/var/Debian.yml
index c785c65c..5ea7a885 100644
--- a/xci/var/Debian.yml
+++ b/xci/var/Debian.yml
@@ -7,5 +7,3 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-# this is the interface the VM nodes are connected to libvirt network "default"
-python_crypto_package_name: python-crypto
diff --git a/xci/var/RedHat.yml b/xci/var/RedHat.yml
index eae7d127..5ea7a885 100644
--- a/xci/var/RedHat.yml
+++ b/xci/var/RedHat.yml
@@ -7,5 +7,3 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-# this is placeholder and left blank intentionally to complete later on
-python_crypto_package_name: python-crypto
diff --git a/xci/var/Suse.yml b/xci/var/Suse.yml
index 5891aee9..5ea7a885 100644
--- a/xci/var/Suse.yml
+++ b/xci/var/Suse.yml
@@ -7,5 +7,3 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-# this is the interface the VM nodes are connected to libvirt network "default"
-python_crypto_package_name: python-pycrypto
diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml
index f438e577..646eaf8e 100644
--- a/xci/var/opnfv.yml
+++ b/xci/var/opnfv.yml
@@ -35,7 +35,7 @@ XCI_CEPH_ENABLED: "{{ lookup('env', 'XCI_CEPH_ENABLED') }}"
RUN_TEMPEST: "{{ lookup('env', 'RUN_TEMPEST') }}"
CORE_OPENSTACK_INSTALL: "{{ lookup('env', 'CORE_OPENSTACK_INSTALL') }}"
DEPLOY_SCENARIO: "{{ lookup('env','DEPLOY_SCENARIO') }}"
-XCI_INSTALLER: "{{ lookup('env','XCI_INSTALLER') }}"
+INSTALLER_TYPE: "{{ lookup('env','INSTALLER_TYPE') }}"
KUBESPRAY_VERSION: "{{ lookup('env','KUBESPRAY_VERSION') }}"
XCI_KUBE_ANSIBLE_PIP_VERSION: "{{ lookup('env','XCI_KUBE_ANSIBLE_PIP_VERSION') }}"
KUBESPRAY_GIT_URL: "{{ lookup('env','KUBESPRAY_GIT_URL') }}"
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 8decec05..70424917 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -22,10 +22,10 @@ submit_bug_report() {
echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION"
echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION"
echo "xci flavor: $XCI_FLAVOR"
- echo "xci installer: $XCI_INSTALLER"
+ echo "xci installer: $INSTALLER_TYPE"
echo "xci scenario: $DEPLOY_SCENARIO"
echo "Environment variables:"
- env | grep --color=never '\(OPNFV\|XCI\|OPENSTACK\|SCENARIO\)'
+ env | grep --color=never '\(OPNFV\|XCI\|INSTALLER_TYPE\|OPENSTACK\|SCENARIO\)'
echo "-------------------------------------------------------------------------"
}
@@ -61,7 +61,7 @@ source $XCI_PATH/xci/config/pinned-versions
# source flavor configuration
source "$XCI_PATH/xci/config/${XCI_FLAVOR}-vars"
# source installer configuration
-source "$XCI_PATH/xci/installer/${XCI_INSTALLER}/env" &>/dev/null || true
+source "$XCI_PATH/xci/installer/${INSTALLER_TYPE}/env" &>/dev/null || true
# source xci configuration
source $XCI_PATH/xci/config/env-vars
# Make sure we pass XCI_PATH everywhere
@@ -90,7 +90,7 @@ echo "Info: Starting XCI Deployment"
echo "Info: Deployment parameters"
echo "-------------------------------------------------------------------------"
echo "xci flavor: $XCI_FLAVOR"
-echo "xci installer: $XCI_INSTALLER"
+echo "xci installer: $INSTALLER_TYPE"
echo "opnfv/releng-xci version: $(git rev-parse HEAD)"
echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION"
echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION"
@@ -147,9 +147,9 @@ echo "Info: VM nodes are provisioned!"
echo "-----------------------------------------------------------------------"
# Deploy OpenStack on the selected installer
-echo "Info: Deploying '${XCI_INSTALLER}' installer"
+echo "Info: Deploying '${INSTALLER_TYPE}' installer"
echo "-----------------------------------------------------------------------"
-source ${XCI_PATH}/xci/installer/${XCI_INSTALLER}/deploy.sh
+source ${XCI_PATH}/xci/installer/${INSTALLER_TYPE}/deploy.sh
# Deployment time
xci_deploy_time=$SECONDS