diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-05-15 10:56:23 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-05-16 14:46:00 +0100 |
| commit | 0ed80c59846e9e1b23d26869f05f109dac7495c5 (patch) | |
| tree | ff57633e68f9a557bd69a4b2ba3327e10e91635f /xci/config/env-vars | |
| parent | 8dc9f3a0d2c4db3bd9720966043dda0d2d4431bb (diff) | |
xci: kubespray: Switch kubespray to dynamic inventory
The kubespray installer contains one inventory per flavor. We can get
rid of these files and use the dynamic inventory similar to OSA.
Moreover, we extend the dynamic inventory to read additional group
variables per flavor if necessary. This way we can still pass additional
information to inventory on per-flavor basis. This also fixes a typo
in the 'IDF' file. We also need to bump Ansible for kubespray since the
version we were using is having troubles with dynamic inventories.
Change-Id: Ic58101555f81aec5fee3c193608440aa89bbe445
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/config/env-vars')
| -rwxr-xr-x | xci/config/env-vars | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index bf333bdf..fe75cb80 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -50,7 +50,7 @@ export ANSIBLE_HOST_KEY_CHECKING=False # subject of the certificate export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O=IT/CN=xci.releng.opnfv.org"} export DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature"} -# Kubespray requires that ansible version is 2.4.0.0 -export XCI_KUBE_ANSIBLE_PIP_VERSION=2.4.0.0 +# Kubespray requires that ansible version is 2.4.4 +export XCI_KUBE_ANSIBLE_PIP_VERSION=2.4.4 # OpenStack global requirements version export OPENSTACK_REQUIREMENTS_VERSION=${OPENSTACK_REQUIREMENTS_VERSION:-$(awk '/requirements_git_install_branch:/ {print $2}' ${XCI_PATH}/xci/installer/osa/files/openstack_services.yml)} |