package v2 ubuntu image

offline deployment should use v2 image
v2 image has partitioning utils

Change-Id: I9ae9a49e5571dbea90d0e4f6376ab3facab16c0a

diff --git a/playbooks/roles/package/defaults/main.yaml b/playbooks/roles/package/defaults/main.yaml
index de7cea7bb4f54188b5d71d39240cf65651e3eea7..6b3e46909feda62eaad4b6adfa404929edae337d 100644 (file)
--- a/playbooks/roles/package/defaults/main.yaml
+++ b/playbooks/roles/package/defaults/main.yaml
@@ -26,14 +26,16 @@ containers_folder: "{{ offline_pkg_folder }}/containers"
 pip_folder: "{{ offline_pkg_folder }}/pip"
 
 helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-linux-amd64.tar.gz"
+dib_images_url: https://artifactory.nordix.org/artifactory/cloud-infra/dib
 
 # some images require architecture
 image_arch: amd64
 
 dib_images:
-  - https://artifactory.nordix.org/artifactory/cloud-infra/dib/deployment_image/ubuntu1804/deployment_image.qcow2
-  - https://artifactory.nordix.org/artifactory/cloud-infra/dib/ipa_image/coreos/ipa.initramfs
-  - https://artifactory.nordix.org/artifactory/cloud-infra/dib/ipa_image/coreos/ipa.kernel
+  - "{{ dib_images_url }}/ipa_image/coreos/ipa.initramfs"
+  - "{{ dib_images_url }}/ipa_image/coreos/ipa.kernel"
+
+dib_deployment_image: "{{ dib_images_url }}/deployment_image/ubuntu1804/deployment_image_{{ deployment_image_version }}.qcow2"
 
 k8s_binaries:
   - calicoctl

diff --git a/playbooks/roles/package/tasks/dib.yaml b/playbooks/roles/package/tasks/dib.yaml
index 887977b2752ed37d2ca20fdd88f6c331b6ca02c3..75ea5a3f5314060477b8519221a78de8398b6ab6 100644 (file)
--- a/playbooks/roles/package/tasks/dib.yaml
+++ b/playbooks/roles/package/tasks/dib.yaml
@@ -32,4 +32,9 @@
     force: true
   loop: "{{ dib_images }}"
 
+- name: Download deployment image used for provisioning nodes
+  get_url:
+    url: "{{ dib_deployment_image }}"
+    dest: "{{ dib_folder }}/deployment_image.qcow2"
+
 # vim: set ts=2 sw=2 expandtab:

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index 98bbbb438258d8b751d0ab716fd8e40e27936486..c05e3105bb49ce8a90f1823864d863147be97db4 100644 (file)
--- a/vars/kubernetes.yaml
+++ b/vars/kubernetes.yaml
@@ -60,6 +60,7 @@ scenarios:
 
 # NOTE (fdegir): set default deploy scenario for the stack
 deploy_scenario: "{{ lookup('env', 'DEPLOY_SCENARIO') | default('k8-multus-plugins', true) }}"
+deployment_image_version: "{{ lookup('env', 'DEPLOYMENT_IMAGE_VERSION') | default('v2', true) }}"
 
 # -------------------------------------------------------------------------------
 # Nordix: Docker version