mirror of https://github.com/ceph/ceph-ansible.git
Merge pull request #1052 from verdurin/revert-1042-centos-extras-ini_file
Revert "Change enabling of extras repo for CentOS to use ini_file"pull/1067/head
commit
fb8167cf79
|
@ -39,11 +39,10 @@
|
||||||
failed_when: false
|
failed_when: false
|
||||||
|
|
||||||
- name: enable extras repo for centos
|
- name: enable extras repo for centos
|
||||||
ini_file:
|
yum_repository:
|
||||||
dest: /etc/yum.repos.d/CentOS-Base.repo
|
name: extras
|
||||||
section: extras
|
state: present
|
||||||
option: enabled
|
enabled: yes
|
||||||
value: 1
|
|
||||||
when: ansible_distribution == 'CentOS'
|
when: ansible_distribution == 'CentOS'
|
||||||
tags:
|
tags:
|
||||||
with_pkg
|
with_pkg
|
||||||
|
|
|
@ -34,13 +34,13 @@
|
||||||
with_pkg
|
with_pkg
|
||||||
|
|
||||||
# ensure extras enabled for docker
|
# ensure extras enabled for docker
|
||||||
- name: enable extras repo for centos
|
- name: enable extras on centos
|
||||||
ini_file:
|
yum_repository:
|
||||||
dest: /etc/yum.repos.d/CentOS-Base.repo
|
name: extras
|
||||||
section: extras
|
state: present
|
||||||
option: enabled
|
enabled: yes
|
||||||
value: 1
|
when:
|
||||||
when: ansible_distribution == 'CentOS'
|
- ansible_distribution == 'CentOS'
|
||||||
tags:
|
tags:
|
||||||
with_pkg
|
with_pkg
|
||||||
|
|
||||||
|
|
|
@ -25,11 +25,10 @@
|
||||||
with_pkg
|
with_pkg
|
||||||
|
|
||||||
- name: enable extras repo for centos
|
- name: enable extras repo for centos
|
||||||
ini_file:
|
yum_repository:
|
||||||
dest: /etc/yum.repos.d/CentOS-Base.repo
|
name: extras
|
||||||
section: extras
|
state: present
|
||||||
option: enabled
|
enabled: yes
|
||||||
value: 1
|
|
||||||
when: ansible_distribution == 'CentOS'
|
when: ansible_distribution == 'CentOS'
|
||||||
tags:
|
tags:
|
||||||
with_pkg
|
with_pkg
|
||||||
|
|
|
@ -44,16 +44,6 @@
|
||||||
tags:
|
tags:
|
||||||
with_pkg
|
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
|
- name: install docker-engine on redhat
|
||||||
yum:
|
yum:
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
|
|
|
@ -39,11 +39,10 @@
|
||||||
failed_when: false
|
failed_when: false
|
||||||
|
|
||||||
- name: enable extras repo for centos
|
- name: enable extras repo for centos
|
||||||
ini_file:
|
yum_repository:
|
||||||
dest: /etc/yum.repos.d/CentOS-Base.repo
|
name: extras
|
||||||
section: extras
|
state: present
|
||||||
option: enabled
|
enabled: yes
|
||||||
value: 1
|
|
||||||
when: ansible_distribution == 'CentOS'
|
when: ansible_distribution == 'CentOS'
|
||||||
tags:
|
tags:
|
||||||
with_pkg
|
with_pkg
|
||||||
|
|
|
@ -32,12 +32,11 @@
|
||||||
tags:
|
tags:
|
||||||
with_pkg
|
with_pkg
|
||||||
|
|
||||||
- name: enable extras repo for centos
|
- name: enable extras repo on centos
|
||||||
ini_file:
|
yum_repository:
|
||||||
dest: /etc/yum.repos.d/CentOS-Base.repo
|
name: extras
|
||||||
section: extras
|
state: present
|
||||||
option: enabled
|
enabled: yes
|
||||||
value: 1
|
|
||||||
when: ansible_distribution == 'CentOS'
|
when: ansible_distribution == 'CentOS'
|
||||||
tags:
|
tags:
|
||||||
with_pkg
|
with_pkg
|
||||||
|
|
|
@ -32,12 +32,11 @@
|
||||||
tags:
|
tags:
|
||||||
with_pkg
|
with_pkg
|
||||||
|
|
||||||
- name: enable extras repo for centos
|
- name: enable extras repo on centos
|
||||||
ini_file:
|
yum_repository:
|
||||||
dest: /etc/yum.repos.d/CentOS-Base.repo
|
name: extras
|
||||||
section: extras
|
state: present
|
||||||
option: enabled
|
enabled: yes
|
||||||
value: 1
|
|
||||||
when: ansible_distribution == 'CentOS'
|
when: ansible_distribution == 'CentOS'
|
||||||
tags:
|
tags:
|
||||||
with_pkg
|
with_pkg
|
||||||
|
|
Loading…
Reference in New Issue