diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-05-22 01:43:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-22 01:43:23 +0000 |
| commit | 65003b68b650dee4bb81d975707a580722fc3897 (patch) | |
| tree | 78828100682d13cd8c5aaa7cda88bee60f813c24 | |
| parent | f0f575b6c0c66cdd82cdc5f17a54e02d445cd9a7 (diff) | |
| parent | 79d769d72aaa797247aa452ce9d9739cef04e8c9 (diff) | |
Merge "Fixing ansible version"
| -rw-r--r-- | kud/deployment_infra/playbooks/kud-vars.yml | 2 | ||||
| -rwxr-xr-x | kud/hosting_providers/vagrant/installer.sh | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml index 8e4f3c4f..d7ada47e 100644 --- a/kud/deployment_infra/playbooks/kud-vars.yml +++ b/kud/deployment_infra/playbooks/kud-vars.yml @@ -61,3 +61,5 @@ go_version: '1.12.4' kubespray_version: 2.8.2 kubectl_version: 1.12.2 helm_client_version: 2.9.1 +# kud playbooks not compatible with 2.8.0 - see MULTICLOUD-634 +ansible_version: 2.7.10 diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh index 2e7a3db1..c37d2746 100755 --- a/kud/hosting_providers/vagrant/installer.sh +++ b/kud/hosting_providers/vagrant/installer.sh @@ -40,12 +40,13 @@ function _install_pip { # _install_ansible() - Install and Configure Ansible program function _install_ansible { - sudo mkdir -p /etc/ansible/ if $(ansible --version &>/dev/null); then - return + sudo pip uninstall -y ansible fi _install_pip - sudo -E pip install ansible + local version=$(grep "ansible_version" ${kud_playbooks}/kud-vars.yml | awk -F ': ' '{print $2}') + sudo mkdir -p /etc/ansible/ + sudo -E pip install ansible==$version } # _install_docker() - Download and install docker-engine |