ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stringify ceph_docker_image_tag 

This could be a numeric input, but is treated like a string leading to
runtime errors.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1635823

Signed-off-by: Noah Watkins <nwatkins@redhat.com>
pull/3212/head
Noah Watkins 2018-10-05 15:56:45 -07:00 committed by mergify[bot]
parent 306e308f13
commit 8dcc8d1434
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
View File

@ -76,12 +76,12 @@
- name: set_fact ceph_uid for ubuntu
set_fact:
ceph_uid: 64045
when: ceph_docker_image_tag is search("ubuntu")
when: ceph_docker_image_tag | string is search("ubuntu")
- name: set_fact ceph_uid for red hat
set_fact:
ceph_uid: 167
when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("centos") or ceph_docker_image_tag is search("fedora")
when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("centos") or ceph_docker_image_tag | string is search("fedora")
- name: set_fact ceph_uid for rhel
set_fact:
@ -159,11 +159,11 @@
- set_fact:
ceph_uid: 64045
when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
- set_fact:
ceph_uid: 167
when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
when: ceph_docker_image_tag | string is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag | string is search("fedora")
- name: set proper ownership on ceph directories
file:
@ -231,12 +231,12 @@
- set_fact:
ceph_uid: 64045
when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
- name: set_fact ceph_uid for red hat
set_fact:
ceph_uid: 167
when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("centos") or ceph_docker_image_tag is search("fedora")
when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("centos") or ceph_docker_image_tag | string is search("fedora")
- name: set_fact ceph_uid for rhel
set_fact:
@ -336,11 +336,11 @@
- set_fact:
ceph_uid: 64045
when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
- set_fact:
ceph_uid: 167
when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
when: ceph_docker_image_tag | string is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag | string is search("fedora")
- name: set proper ownership on ceph directories
file:
@ -379,11 +379,11 @@
- set_fact:
ceph_uid: 64045
when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
- set_fact:
ceph_uid: 167
when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
when: ceph_docker_image_tag | string is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag | string is search("fedora")
- name: set proper ownership on ceph directories
file:
@ -422,11 +422,11 @@
- set_fact:
ceph_uid: 64045
when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
- set_fact:
ceph_uid: 167
when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
when: ceph_docker_image_tag | string is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag | string is search("fedora")
- name: set proper ownership on ceph directories
file:
@ -469,11 +469,11 @@
- set_fact:
ceph_uid: 64045
when: ceph_docker_image_tag is match("latest") or ceph_docker_image_tag is search("ubuntu")
when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
- set_fact:
ceph_uid: 167
when: ceph_docker_image_tag is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag is search("fedora")
when: ceph_docker_image_tag | string is search("centos") or ceph_docker_image is search("rhceph") or ceph_docker_image_tag | string is search("fedora")
- name: set proper ownership on ceph directories
file:

4
roles/ceph-defaults/tasks/facts.yml
View File

@ -209,14 +209,14 @@
ceph_uid: 64045
when:
- containerized_deployment
- ceph_docker_image_tag is search("ubuntu")
- ceph_docker_image_tag | string is search("ubuntu")
- name: set_fact ceph_uid for red hat based system - container
set_fact:
ceph_uid: 167
when:
- containerized_deployment
- ceph_docker_image_tag is search("latest") or ceph_docker_image_tag is search("centos") or ceph_docker_image_tag is search("fedora")
- ceph_docker_image_tag | string is search("latest") or ceph_docker_image_tag | string is search("centos") or ceph_docker_image_tag | string is search("fedora")
- name: set_fact ceph_uid for red hat
set_fact: