Define ceph image in overcloud_containers.yaml.j2

This change allows the ceph container image to be included in the
kolla image prepare workflow, even when coming from a different build
pipeline and source registry.

Defaults can be overridden using --set. The following achieves the
same as the defaults:

  openstack overcloud container image prepare \
    --set ceph_namespace=ceph \
    --set ceph_image=daemon \
    --set ceph_tag=tag-build-master-jewel-centos-7

Change-Id: Ib8427bfbdc44cf36ce2b71e1a9746354c96768d8
Closes-Bug: #1714225
This commit is contained in:
Steve Baker
2017-09-01 09:48:43 +12:00
committed by Giulio Fidente
parent 5422ea0962
commit 020103b310
2 changed files with 14 additions and 7 deletions

View File

@@ -85,3 +85,4 @@ container_images:
- imagename: tripleoupstream/centos-binary-swift-proxy-server:latest - imagename: tripleoupstream/centos-binary-swift-proxy-server:latest
- imagename: tripleoupstream/centos-binary-tacker:latest - imagename: tripleoupstream/centos-binary-tacker:latest
- imagename: tripleoupstream/centos-binary-zaqar:latest - imagename: tripleoupstream/centos-binary-zaqar:latest
- imagename: ceph/daemon:tag-build-master-jewel-centos-7

View File

@@ -1,5 +1,9 @@
{% set namespace=namespace or "tripleoupstream" %} {% set namespace=namespace or "tripleoupstream" %}
{% set ceph_namespace=ceph_namespace or "ceph" %}
{% set ceph_image=ceph_image or "daemon" %}
{% set ceph_tag=ceph_tag or "tag-build-master-jewel-centos-7" %}
{% if name_prefix and not name_prefix.endswith('-') %} {% if name_prefix and not name_prefix.endswith('-') %}
{% set name_prefix=name_prefix + "-" %} {% set name_prefix=name_prefix + "-" %}
{% else %} {% else %}
@@ -618,10 +622,12 @@ container_images_template:
services: services:
- OS::TripleO::Services::Zaqar - OS::TripleO::Services::Zaqar
# FIXME(gfidente): we don't use any prefix here so it would be nice to - imagename: "{{ceph_namespace}}/{{ceph_image}}:{{ceph_tag}}"
# not have the --pull-source registry prepended, we can probably add params:
# another {{keyword}} to describe where we want and where we do not - DockerCephDaemonImage
# services:
#- imagename: "ceph/daemon:tag-build-master-jewel-centos-7" - OS::TripleO::Services::CephMds
# params: - OS::TripleO::Services::CephMon
# - DockerCephDaemonImage - OS::TripleO::Services::CephOSD
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CephRbdMirror