diff options
| -rwxr-xr-x | xci/config/env-vars | 2 | ||||
| -rwxr-xr-x | xci/config/user-vars | 6 | ||||
| -rw-r--r-- | xci/installer/osa/playbooks/configure-opnfvhost.yml | 2 | ||||
| -rw-r--r-- | xci/playbooks/configure-localhost.yml | 12 | ||||
| -rw-r--r-- | xci/playbooks/get-opnfv-scenario-requirements.yml | 4 | ||||
| -rw-r--r-- | xci/var/opnfv.yml | 2 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 12 |
7 files changed, 20 insertions, 20 deletions
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 451b6b85..fadf7ccc 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/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml index 2996236b..bfba4717 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: 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/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 77d12535..053c12d1 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 @@ -88,7 +88,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" @@ -145,9 +145,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 |