aboutsummaryrefslogtreecommitdiffstats
path: root/kud
diff options
context:
space:
mode:
authorEric Multanen <eric.w.multanen@intel.com>2021-06-24 20:34:32 +0000
committerGerrit Code Review <gerrit@onap.org>2021-06-24 20:34:32 +0000
commit47b2506e0faa431a32222adb0ffb9fcddb763293 (patch)
treef1f08f288e6a64dd9907b91beafc4907e8e3e56e /kud
parentd533f70866e1e2a56adbdccddc10d70fa1020990 (diff)
parent56533d9c462b270490a4621e3ccd989a67ba38f2 (diff)
Merge "Let kubespray choose installed docker version"
Diffstat (limited to 'kud')
-rw-r--r--kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml2
-rwxr-xr-xkud/hosting_providers/vagrant/installer.sh38
-rw-r--r--kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml2
3 files changed, 0 insertions, 42 deletions
diff --git a/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml b/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml
index 7d0404a5..498d0fb4 100644
--- a/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml
+++ b/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml
@@ -14,8 +14,6 @@
# Editing those values will almost surely break something.
system_namespace: kube-system
-docker_version: 'latest'
-
# Logging directory (sysvinit systems)
kube_log_dir: "/var/log/kubernetes"
diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh
index c88dc9e6..463ac925 100755
--- a/kud/hosting_providers/vagrant/installer.sh
+++ b/kud/hosting_providers/vagrant/installer.sh
@@ -61,42 +61,6 @@ function _install_ansible {
sudo -E pip install --no-cache-dir ansible==$version
}
-# _install_docker() - Download and install docker-engine
-function _install_docker {
- local max_concurrent_downloads=${1:-3}
-
- if $(docker version &>/dev/null); then
- return
- fi
- sudo apt-get install -y apt-transport-https ca-certificates curl
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
- sudo apt-get update
- sudo apt-get install -y docker-ce
-
- sudo mkdir -p /etc/systemd/system/docker.service.d
- if [ ${http_proxy:-} ]; then
- echo "[Service]" | sudo tee /etc/systemd/system/docker.service.d/http-proxy.conf
- echo "Environment=\"HTTP_PROXY=$http_proxy\"" | sudo tee --append /etc/systemd/system/docker.service.d/http-proxy.conf
- fi
- if [ ${https_proxy:-} ]; then
- echo "[Service]" | sudo tee /etc/systemd/system/docker.service.d/https-proxy.conf
- echo "Environment=\"HTTPS_PROXY=$https_proxy\"" | sudo tee --append /etc/systemd/system/docker.service.d/https-proxy.conf
- fi
- if [ ${no_proxy:-} ]; then
- echo "[Service]" | sudo tee /etc/systemd/system/docker.service.d/no-proxy.conf
- echo "Environment=\"NO_PROXY=$no_proxy\"" | sudo tee --append /etc/systemd/system/docker.service.d/no-proxy.conf
- fi
- sudo systemctl daemon-reload
- echo "DOCKER_OPTS=\"-H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --max-concurrent-downloads $max_concurrent_downloads \"" | sudo tee --append /etc/default/docker
- if [[ -z $(groups | grep docker) ]]; then
- sudo usermod -aG docker $USER
- fi
-
- sudo systemctl restart docker
- sleep 10
-}
-
function _set_environment_file {
# By default ovn central interface is the first active network interface on localhost. If other wanted, need to export this variable in aio.sh or Vagrant file.
OVN_CENTRAL_INTERFACE="${OVN_CENTRAL_INTERFACE:-$(ip addr show | awk '/inet.*brd/{print $NF; exit}')}"
@@ -116,7 +80,6 @@ function install_k8s {
local tarball=v$version.tar.gz
sudo apt-get install -y sshpass make unzip # install make to run mitogen target and unzip is mitogen playbook dependency
sudo apt-get install -y gnupg2 software-properties-common
- _install_docker
_install_ansible
wget https://github.com/kubernetes-incubator/kubespray/archive/$tarball
sudo tar -C $dest_folder -xzf $tarball
@@ -248,7 +211,6 @@ function install_addons {
# install_plugin() - Install ONAP Multicloud Kubernetes plugin
function install_plugin {
echo "Installing multicloud/k8s plugin"
- _install_docker
sudo -E pip install --no-cache-dir docker-compose
sudo mkdir -p /opt/{kubeconfig,consul/config}
diff --git a/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
index 7803f27a..a9a7a933 100644
--- a/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
+++ b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml
@@ -14,8 +14,6 @@
# Editing those values will almost surely break something.
system_namespace: kube-system
-docker_version: 'latest'
-
# Logging directory (sysvinit systems)
kube_log_dir: "/var/log/kubernetes"