Control docker version within stack

Docker version was originally controlled within engine repository
but it is more appropriate to control it within the stack as the
version requirements could be different across the stacks. See the
dependent change for how it was controlled before.

Depends-On: Id5f2c72e35bba4d5ab413f7b19119330540f5674
Change-Id: I2720d6b6ddcde0f742f527e3f86b3085f13aaeda

diff --git a/playbooks/roles/package/defaults/main.yaml b/playbooks/roles/package/defaults/main.yaml
index 44f045e6aca0563e80d56872b2ae18e6e3f82ef4..136ae2b6171c469901963fb5fbf70ba8c9c56e4a 100644 (file)
--- a/playbooks/roles/package/defaults/main.yaml
+++ b/playbooks/roles/package/defaults/main.yaml
@@ -190,11 +190,6 @@ repositories:
     dest: "hwconfig"
     version: "{{ lookup('env', 'NORDIX_HWCONFIG_VERSION') | default('master', true) }}"
     refspec: "{{ lookup('env', 'NORDIX_HWCONFIG_REFSPEC') | default(omit) }}"
-  test:
-    repo: "https://gerrit.nordix.org/infra/test.git"
-    dest: "test"
-    version: "{{ lookup('env', 'NORDIX_TEST_VERSION') | default('master', true) }}"
-    refspec: "{{ lookup('env', 'NORDIX_TEST_REFSPEC') | default(omit) }}"
   # NOTE (fdegir): Engine provisioner and installer repos will be prepended with engine
   # in order to prevent name clashes during packaging
   # NOTE (fdegir): stack git details are inherited from engine/inventory/group_vars/all/sdf.yaml

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index 5accc0140efce8e7a35efd662147af7612389293..905bb358f3b1b4de2dbaae89a50d2de0ebd941d8 100644 (file)
--- a/vars/kubernetes.yaml
+++ b/vars/kubernetes.yaml
@@ -55,6 +55,17 @@ scenarios:
   - k8-multus-plugins
   - k8-weave-nofeature
 
+# -------------------------------------------------------------------------------
+# Nordix: Docker version
+# -------------------------------------------------------------------------------
+# NOTE (fdegir): versions of docker as of 13.02.2020 matching to what Kubespray uses
+# Please note that docker-ce version is configured to be overrideable since some scenarios
+# require different docker versions
+docker_ce_version: "{{ lookup('env', 'DOCKER_CE_VERSION') | default('5:18.09.9~3-0~ubuntu-bionic', true) }}"
+docker_ce_cli_version: "{{ docker_ce_version }}"
+docker_registry_version: "2.7.1"
+containerd_io_version: "1.2.6-3"
+
 # -------------------------------------------------------------------------------
 # Kubernetes: Kubernetes and kubectl versions
 # -------------------------------------------------------------------------------