Skip to content

Commit

Permalink
install epel-release on RHEL7
Browse files Browse the repository at this point in the history
  • Loading branch information
Smana committed Feb 13, 2016
1 parent a649aa8 commit c0cf506
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
6 changes: 0 additions & 6 deletions roles/kubernetes/master/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,3 @@
name: kubelet
state: restarted
changed_when: false

- name: restart kube-apiserver
service:
name: kube-apiserver
state: restarted
when: secret_changed | default(false)
5 changes: 3 additions & 2 deletions roles/kubernetes/master/tasks/start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
name: kube-apiserver
state: restarted
enabled: yes
when: restart_apimaster is defined and restart_apimaster == True
when: ( restart_apimaster is defined and restart_apimaster == True) or
secret_changed | default(false)

- name: Enable apiserver
service:
name: kube-apiserver
enabled: yes
state: started
when: restart_apimaster is not defined or restart_apimaster == False
when: restart_apimaster is not defined or restart_apimaster == False
13 changes: 8 additions & 5 deletions roles/kubernetes/preinstall/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,26 @@
when: ansible_pkg_mgr == 'yum'

- name: Install python-apt for Debian distribs
shell: apt-get install -y python-apt
command: apt-get install -y python-apt
when: ansible_os_family == "Debian"
changed_when: False

- name: Install python-dnf for latest RedHat versions
shell: dnf install -y python-dnf yum
command: dnf install -y python-dnf yum
when: ansible_distribution == "Fedora" and
ansible_distribution_major_version > 21
changed_when: False

- name: Install epel-release for RedHat and CentOS distribs
- name: Install epel-release on RHEL
command: rpm -ivh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
when: ansible_distribution == "RedHat"

- name: Install epel-release on CentOS
action:
module: "{{ ansible_pkg_mgr }}"
name: "epel-release"
state: latest
when: ansible_distribution == "RedHat" or
ansible_distribution == "CentOS"
when: ansible_distribution == "CentOS"

- name: Install packages requirements
action:
Expand Down

0 comments on commit c0cf506

Please sign in to comment.