diff options
author | Ritu Sood <ritu.sood@intel.com> | 2020-11-19 18:12:18 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-11-19 18:12:18 +0000 |
commit | 0206e988b2c05df33e454f8ea3975152b6ecc338 (patch) | |
tree | 9b0699ce9d2f9cd101fc48759670dd931a4d1e03 /kud/hosting_providers/vagrant/installer.sh | |
parent | d2ca7962b498529868eb009352b05ba9932f8724 (diff) | |
parent | e3c7d3d4153d3a9383d4ebcaa004e54b1b0b64c2 (diff) |
Merge "Upgrade kubespray from 2.12.6 to 2.14.1"
Diffstat (limited to 'kud/hosting_providers/vagrant/installer.sh')
-rwxr-xr-x | kud/hosting_providers/vagrant/installer.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh index 71e4d8b7..94f3c58c 100755 --- a/kud/hosting_providers/vagrant/installer.sh +++ b/kud/hosting_providers/vagrant/installer.sh @@ -102,6 +102,7 @@ function _set_environment_file { echo "export OVN_CENTRAL_ADDRESS=$(get_ovn_central_address)" | sudo tee --append /etc/environment echo "export KUBE_CONFIG_DIR=/opt/kubeconfig" | sudo tee --append /etc/environment echo "export CSAR_DIR=/opt/csar" | sudo tee --append /etc/environment + echo "export ANSIBLE_CONFIG=${ANSIBLE_CONFIG}" | sudo tee --append /etc/environment } # install_k8s() - Install Kubernetes using kubespray tool @@ -117,7 +118,6 @@ function install_k8s { _install_ansible wget https://github.com/kubernetes-incubator/kubespray/archive/$tarball sudo tar -C $dest_folder -xzf $tarball - sudo mv $dest_folder/kubespray-$version/ansible.cfg /etc/ansible/ansible.cfg sudo chown -R $USER $dest_folder/kubespray-$version sudo mkdir -p ${local_release_dir}/containers rm $tarball @@ -139,6 +139,8 @@ function install_k8s { if [[ -n "${https_proxy:-}" ]]; then echo "https_proxy: \"$https_proxy\"" | tee --append $kud_inventory_folder/group_vars/all.yml fi + export ANSIBLE_CONFIG=$dest_folder/kubespray-$version/ansible.cfg + ansible-playbook $verbose -i $kud_inventory $kud_playbooks/preconfigure-kubespray.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log ansible-playbook $verbose -i $kud_inventory $dest_folder/kubespray-$version/cluster.yml --become --become-user=root | sudo tee $log_folder/setup-kubernetes.log # Configure environment |