openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Set container images for CNS"

Browse Source
This commit is contained in:
Zuul 2018-09-08 13:21:36 +00:00 committed by Gerrit Code Review
commit 17b5799b14
1 changed files with 52 additions and 0 deletions

52
extraconfig/services/openshift-cns.yaml

@ -41,6 +41,15 @@ parameters:
type: comma_delimited_list
tags:
- role_specific
DockerOpenShiftGlusterFSImage:
description: Container image to use for GlusterFS pod
type: string
DockerOpenShiftGlusterFSBlockImage:
description: Container image to use for glusterblock-provisioner pod
type: string
DockerOpenShiftGlusterFSHeketiImage:
description: Container image to use for heketi pods
type: string
resources:
RoleParametersValue:
@ -97,6 +106,46 @@ outputs:
set_fact:
openshift_gluster_disks: {get_attr: [RoleParametersValue, value, OpenShiftGlusterDisks]}
- name: set openshift images vars fact
set_fact:
openshift_gluster_images:
openshift_storage_glusterfs_image:
yaql:
expression:
$.data.image.rightSplit(":", 1)[0]
data:
image: {get_param: DockerOpenShiftGlusterFSImage}
openshift_storage_glusterfs_version:
yaql:
expression:
$.data.image.rightSplit(":", 1)[1]
data:
image: {get_param: DockerOpenShiftGlusterFSImage}
openshift_storage_glusterfs_block_image:
yaql:
expression:
$.data.image.rightSplit(":", 1)[0]
data:
image: {get_param: DockerOpenShiftGlusterFSBlockImage}
openshift_storage_glusterfs_block_version:
yaql:
expression:
$.data.image.rightSplit(":", 1)[1]
data:
image: {get_param: DockerOpenShiftGlusterFSBlockImage}
openshift_storage_glusterfs_heketi_image:
yaql:
expression:
$.data.image.rightSplit(":", 1)[0]
data:
image: {get_param: DockerOpenShiftGlusterFSHeketiImage}
openshift_storage_glusterfs_heketi_version:
yaql:
expression:
$.data.image.rightSplit(":", 1)[1]
data:
image: {get_param: DockerOpenShiftGlusterFSHeketiImage}
- name: generate openshift inventory for openshift_glusterfs service
lineinfile:
path: "{{playbook_dir}}/openshift/inventory/openshift_glusterfs.ini"
@ -138,3 +187,6 @@ outputs:
ansible_become: true
openshift_schedulable: true
{% endfor %}
vars:
{{openshift_gluster_images | to_nice_yaml() | indent(4) }}