summaryrefslogtreecommitdiffstats
path: root/roles/openshift_common/tasks
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-06 10:00:31 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-06 10:00:31 -0500
commit3aed7219448ab99377643c71d05f2a26b6e11c99 (patch)
treeb8f16225ad95f5692fca3d4c61c9f5f6235c732b /roles/openshift_common/tasks
parentfbf0302567cfd019a762d9c37f8c10b65b269768 (diff)
parentb7008f070afe2629c9ebcbbdf0af3fa1f6ed9d34 (diff)
downloadopenshift-3aed7219448ab99377643c71d05f2a26b6e11c99.tar.gz
openshift-3aed7219448ab99377643c71d05f2a26b6e11c99.tar.bz2
openshift-3aed7219448ab99377643c71d05f2a26b6e11c99.tar.xz
openshift-3aed7219448ab99377643c71d05f2a26b6e11c99.zip
Merge pull request #94 from detiber/iptables
Add iptables firewall support to openshift-common
Diffstat (limited to 'roles/openshift_common/tasks')
-rw-r--r--roles/openshift_common/tasks/firewall.yml34
-rw-r--r--roles/openshift_common/tasks/main.yml16
2 files changed, 8 insertions, 42 deletions
diff --git a/roles/openshift_common/tasks/firewall.yml b/roles/openshift_common/tasks/firewall.yml
deleted file mode 100644
index 514466769..000000000
--- a/roles/openshift_common/tasks/firewall.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-# TODO: Ansible 1.9 will eliminate the need for separate firewalld tasks for
-# enabling rules and making them permanent with the immediate flag
-- name: "Add firewalld allow rules"
- firewalld:
- port: "{{ item.port }}"
- permanent: false
- state: enabled
- with_items: allow
- when: allow is defined
-
-- name: "Persist firewalld allow rules"
- firewalld:
- port: "{{ item.port }}"
- permanent: true
- state: enabled
- with_items: allow
- when: allow is defined
-
-- name: "Remove firewalld allow rules"
- firewalld:
- port: "{{ item.port }}"
- permanent: false
- state: disabled
- with_items: deny
- when: deny is defined
-
-- name: "Persist removal of firewalld allow rules"
- firewalld:
- port: "{{ item.port }}"
- permanent: true
- state: disabled
- with_items: deny
- when: deny is defined
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index b94fca690..723bdd9fa 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -7,6 +7,14 @@
- name: Configure local facts file
file: path=/etc/ansible/facts.d/ state=directory mode=0750
+- name: Add KUBECONFIG to .bash_profile for user root
+ lineinfile:
+ dest: /root/.bash_profile
+ regexp: "KUBECONFIG="
+ line: "export KUBECONFIG=/var/lib/openshift/openshift.local.certificates/admin/.kubeconfig"
+ state: present
+ insertafter: EOF
+
- name: Set common OpenShift facts
include: set_facts.yml
facts:
@@ -19,11 +27,3 @@
- section: common
option: debug_level
value: "{{ openshift_debug_level }}"
-
-- name: Add KUBECONFIG to .bash_profile for user root
- lineinfile:
- dest: /root/.bash_profile
- regexp: "KUBECONFIG="
- line: "export KUBECONFIG=/var/lib/openshift/openshift.local.certificates/admin/.kubeconfig"
- state: present
- insertafter: EOF