diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-03-12 14:34:18 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-03-12 13:44:03 +0000 |
| commit | 797efff8b6772b606f65822fbae6edfda35be0d2 (patch) | |
| tree | 28e435f0e9d8150451d225c626c151d6e914456b /xci/config | |
| parent | cea2e3355bc6b5c059349c6c3ca2e96d214cbfb4 (diff) | |
Combine vars setting installer type in INSTALLER_TYPE
Change-Id: I330bc036f901d4ba61bc94ee6e085cadf54b4d8b
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/env-vars | 2 | ||||
| -rwxr-xr-x | xci/config/user-vars | 6 |
2 files changed, 4 insertions, 4 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 |