From 777913e9dad7d006cfe0dd3c8e1cf0ddd648aa0d Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Thu, 16 Mar 2017 10:57:13 +0100 Subject: [PATCH] docker: change centos extra repo var name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is not only for monitors, but also mds, rgw and rbd mirror so making the var name more generic: ceph_docker_enable_centos_extra_repo Signed-off-by: Sébastien Han --- group_vars/docker-commons.yml.sample | 2 +- roles/ceph-docker-common/defaults/main.yml | 2 +- roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/docker-commons.yml.sample b/group_vars/docker-commons.yml.sample index c6ef74d4b..8515116ee 100644 --- a/group_vars/docker-commons.yml.sample +++ b/group_vars/docker-commons.yml.sample @@ -9,5 +9,5 @@ dummy: #ceph_docker_registry: docker.io -#ceph_mon_docker_enable_centos_extra_repo: false +#ceph_docker_enable_centos_extra_repo: false diff --git a/roles/ceph-docker-common/defaults/main.yml b/roles/ceph-docker-common/defaults/main.yml index 66408683f..073aec00c 100644 --- a/roles/ceph-docker-common/defaults/main.yml +++ b/roles/ceph-docker-common/defaults/main.yml @@ -1,4 +1,4 @@ --- ceph_docker_registry: docker.io -ceph_mon_docker_enable_centos_extra_repo: false +ceph_docker_enable_centos_extra_repo: false diff --git a/roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml b/roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml index c337a6fa1..cb0951c86 100644 --- a/roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml +++ b/roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml @@ -20,7 +20,7 @@ enabled: yes when: - ansible_distribution == 'CentOS' - - ceph_mon_docker_enable_centos_extra_repo + - ceph_docker_enable_centos_extra_repo tags: with_pkg -- 2.39.5