Revert "Change enabling of extras repo for CentOS to use ini_file"

diff --git a/roles/ceph-mds/tasks/docker/pre_requisite.yml b/roles/ceph-mds/tasks/docker/pre_requisite.yml
index 96013112192e22c831225688bb9cb3ab11a5ddcb..a3ef113f3c3deff9372f0d2fc3ba94fc6d23f5ec 100644 (file)
--- a/roles/ceph-mds/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-mds/tasks/docker/pre_requisite.yml
@@ -39,11 +39,10 @@
   failed_when: false
 
 - name: enable extras repo for centos
-  ini_file:
-    dest: /etc/yum.repos.d/CentOS-Base.repo
-    section: extras
-    option: enabled
-    value: 1
+  yum_repository:
+    name: extras
+    state: present
+    enabled: yes
   when: ansible_distribution == 'CentOS'
   tags:
     with_pkg

diff --git a/roles/ceph-mon/tasks/docker/pre_requisite.yml b/roles/ceph-mon/tasks/docker/pre_requisite.yml
index 1e43af4e8867d20db675f153a4cca351eede6c89..ec44581a3b43afc3890b4423903b662fe89d59ac 100644 (file)
--- a/roles/ceph-mon/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-mon/tasks/docker/pre_requisite.yml
@@ -34,13 +34,13 @@
     with_pkg
 
 # ensure extras enabled for docker
-- name: enable extras repo for centos
-  ini_file:
-    dest: /etc/yum.repos.d/CentOS-Base.repo
-    section: extras
-    option: enabled
-    value: 1
-  when: ansible_distribution == 'CentOS'
+- name: enable extras on centos
+  yum_repository:
+    name: extras
+    state: present
+    enabled: yes
+  when:
+    - ansible_distribution == 'CentOS'
   tags:
     with_pkg
 

diff --git a/roles/ceph-nfs/tasks/docker/pre_requisite.yml b/roles/ceph-nfs/tasks/docker/pre_requisite.yml
index 7a7b807b83d92d0abdb907831ac17a9e6f03c9d7..27142aa46ca7a78d95ac6b9a38d5fe3ea33ddda5 100644 (file)
--- a/roles/ceph-nfs/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-nfs/tasks/docker/pre_requisite.yml
@@ -25,11 +25,10 @@
     with_pkg
 
 - name: enable extras repo for centos
-  ini_file:
-    dest: /etc/yum.repos.d/CentOS-Base.repo
-    section: extras
-    option: enabled
-    value: 1
+  yum_repository:
+    name: extras
+    state: present
+    enabled: yes
   when: ansible_distribution == 'CentOS'
   tags:
     with_pkg

diff --git a/roles/ceph-osd/tasks/docker/pre_requisite.yml b/roles/ceph-osd/tasks/docker/pre_requisite.yml
index 24f87758ffa5ed58d8853ca443e7a10e52bbd8f0..ab7e21057fa6cdc196b6c03b39388c36a6c784d1 100644 (file)
--- a/roles/ceph-osd/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-osd/tasks/docker/pre_requisite.yml
@@ -44,16 +44,6 @@
   tags:
     with_pkg
 
-- name: enable extras repo for centos
-  ini_file:
-    dest: /etc/yum.repos.d/CentOS-Base.repo
-    section: extras
-    option: enabled
-    value: 1
-  when: ansible_distribution == 'CentOS'
-  tags:
-    with_pkg
-
 - name: install docker-engine on redhat
   yum:
     name: "{{ item }}"

diff --git a/roles/ceph-rbd-mirror/tasks/docker/pre_requisite.yml b/roles/ceph-rbd-mirror/tasks/docker/pre_requisite.yml
index 713a762d54974dcf08b8ff75e35fa67796351716..52514026484deb59f03cd01d8a7ee3fd47bede4c 100644 (file)
--- a/roles/ceph-rbd-mirror/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-rbd-mirror/tasks/docker/pre_requisite.yml
@@ -39,11 +39,10 @@
   failed_when: false
 
 - name: enable extras repo for centos
-  ini_file:
-    dest: /etc/yum.repos.d/CentOS-Base.repo
-    section: extras
-    option: enabled
-    value: 1
+  yum_repository:
+    name: extras
+    state: present
+    enabled: yes
   when: ansible_distribution == 'CentOS'
   tags:
     with_pkg

diff --git a/roles/ceph-restapi/tasks/docker/pre_requisite.yml b/roles/ceph-restapi/tasks/docker/pre_requisite.yml
index 29ccc00739a97526eaa65e6fde4e1b76dcf66118..d004714ad07243c8df5fbc0ea70902583e97a38c 100644 (file)
--- a/roles/ceph-restapi/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-restapi/tasks/docker/pre_requisite.yml
@@ -32,12 +32,11 @@
   tags:
     with_pkg
 
-- name: enable extras repo for centos
-  ini_file:
-    dest: /etc/yum.repos.d/CentOS-Base.repo
-    section: extras
-    option: enabled
-    value: 1
+- name: enable extras repo on centos
+  yum_repository:
+    name: extras
+    state: present
+    enabled: yes
   when: ansible_distribution == 'CentOS'
   tags:
     with_pkg

diff --git a/roles/ceph-rgw/tasks/docker/pre_requisite.yml b/roles/ceph-rgw/tasks/docker/pre_requisite.yml
index 7427b4e6fb8123605d6e450f0bc520a4111730ad..d135a7f1db31dd74502acafe2373ba4998724675 100644 (file)
--- a/roles/ceph-rgw/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-rgw/tasks/docker/pre_requisite.yml
@@ -32,12 +32,11 @@
   tags:
     with_pkg
     
-- name: enable extras repo for centos
-  ini_file:
-    dest: /etc/yum.repos.d/CentOS-Base.repo
-    section: extras
-    option: enabled
-    value: 1
+- name: enable extras repo on centos
+  yum_repository:
+    name: extras
+    state: present
+    enabled: yes
   when: ansible_distribution == 'CentOS'
   tags:
     with_pkg