docker: change centos extra repo var name

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 <seb@redhat.com>

diff --git a/group_vars/docker-commons.yml.sample b/group_vars/docker-commons.yml.sample
index c6ef74d4b132fc12cc4d47cb85d291772d522829..8515116eef0c28bbbca535325c3d189877c8fcb6 100644 (file)
--- 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 66408683f2775bc7a0213958c20cafd9946bd612..073aec00c8f14ddd4882d03b6fb792da2e3513bb 100644 (file)
--- 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 c337a6fa1586e3745201b367ed680b2c1f7cbd1f..cb0951c86a9bb8f1f3d98047dbe336d0be5a0d21 100644 (file)
--- 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