summaryrefslogtreecommitdiffstats
path: root/roles/base_os/tasks
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@redhat.com>2015-02-24 10:16:20 -0500
committerMatt Woodson <mwoodson@redhat.com>2015-02-24 10:16:20 -0500
commit41ad58a9b9cd59eb5d8bece20d0c1073190d67b4 (patch)
tree7f11cf6a031a5c8b0efe9618c7ec3476c39fcbb8 /roles/base_os/tasks
parentf780d4fa01a1e8b1559d31a7065715317a884ec4 (diff)
parent0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db (diff)
downloadopenshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.gz
openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.bz2
openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.xz
openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.zip
Merge branch 'master' into tower_install
Conflicts: lib/aws_command.rb
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 dddedeaa8..448221cfb 100644
--- a/roles/base_os/tasks/main.yaml
+++ b/roles/base_os/tasks/main.yaml
@@ -11,10 +11,13 @@
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=/var/lib/openshift/openshift.local.certificates/admin/.kubeconfig"
+ state: present
+ insertafter: EOF
- name: Bash Completion
yum:
@@ -26,11 +29,13 @@
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