From 75b10e171071471e2d45026b7a7e0b5dccd9ff41 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 24 Jan 2019 18:11:13 +0100 Subject: [PATCH] Add logic to use different Ceph container images based on OSP version Previously there were some overrides in tripleo-quickstart to use a different Ceph container image for pike; having a condition in tripleo-quickstart-extras seems better as it moves the logic to pick the right container image in one repo/file. Change-Id: Iefa73f7df58d9ef0c32ace3cdfc92fee3540841c --- roles/extras-common/defaults/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml index 4c6eb6f06..d95884f6f 100644 --- a/roles/extras-common/defaults/main.yml +++ b/roles/extras-common/defaults/main.yml @@ -27,7 +27,12 @@ docker_prep_prefix: centos-binary- docker_prep_suffix: "" docker_ceph_namespace: docker.io/ceph docker_ceph_image: daemon -docker_ceph_tag: v3.2.1-stable-3.2-luminous-centos-7-x86_64 +docker_ceph_tag: >- + {% if release in ['pike'] -%} + v3.0.3-stable-3.0-jewel-centos-7-x86_64 + {%- else -%} + v3.2.1-stable-3.2-luminous-centos-7-x86_64 + {%- endif -%} additional_insecure_registry: false deployed_server: false overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates