summaryrefslogtreecommitdiffstats
path: root/roles/base_os/tasks
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-02-20 11:43:19 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-02-20 11:43:22 -0500
commit1932b8d007792e29c609099708224c6a4e29288e (patch)
tree2e03740fb14e55aab3aecdfe0075c43243e7fdf7 /roles/base_os/tasks
parenta1b6d03c256ff0065cb7a8772533a1b2c81410e1 (diff)
downloadopenshift-1932b8d007792e29c609099708224c6a4e29288e.tar.gz
openshift-1932b8d007792e29c609099708224c6a4e29288e.tar.bz2
openshift-1932b8d007792e29c609099708224c6a4e29288e.tar.xz
openshift-1932b8d007792e29c609099708224c6a4e29288e.zip
Set and export KUBECONFIG in root user .bash_profile
- roles/base_os: Without this, the root user would need to manually configure this variable before attempting to run any osc commands - roles/base_os: Cleanup the firewall service definition and only pause when the service state changes. - roles/openshift_master: use Akram's suggestion of simplifying the firewall config - roles/openshift_master: explicitly disable previously exposed ports that are no longer exposed (8080/tcp I'm looking at you).
Diffstat (limited to 'roles/base_os/tasks')
-rw-r--r--roles/base_os/tasks/main.yaml23
1 files changed, 14 insertions, 9 deletions
diff --git a/roles/base_os/tasks/main.yaml b/roles/base_os/tasks/main.yaml
index 01d2898c5..b18f5c40d 100644
--- a/roles/base_os/tasks/main.yaml
+++ b/roles/base_os/tasks/main.yaml
@@ -11,21 +11,26 @@
src: vimrc
dest: /root/.vimrc
-- name: Ensure vimrc is installed for user root
- copy:
- src: vimrc
- dest: /root/.vimrc
+- name: Add KUBECONFIG to .bash_profile for user root
+ lineinfile:
+ dest: /root/.bash_profile
+ regexp: "KUBECONFIG="
+ line: "export KUBECONFIG={{ openshift_master_credentials_dir }}.kubeconfig"
+ state: present
+ insertafter: EOF
- name: Install firewalld
yum:
pkg: firewalld
state: installed
-- name: enable firewalld service
- command: /usr/bin/systemctl enable firewalld.service
-
-- name: start firewalld service
- command: /usr/bin/systemctl start firewalld.service
+- name: start and enable firewalld service
+ service:
+ name: firewalld
+ state: started
+ enabled: yes
+ register: result
- name: need to pause here, otherwise the firewalld service starting can sometimes cause ssh to fail
pause: seconds=10
+ when: result | changed