summaryrefslogtreecommitdiffstats
path: root/roles/base_os
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2015-02-20 14:29:02 -0700
committerJhon Honce <jhonce@redhat.com>2015-02-20 14:29:02 -0700
commit551dccac66421664a87de523c0e3cc2a6392beb9 (patch)
tree4e4ab1aa7d6ee4d4425b0a126f028f69b62c9c67 /roles/base_os
parentff402ef719a74a76407fef2569a11ee85dfb1093 (diff)
parentdcd84a6c524c217432f4b529b66da165bf4ff3e9 (diff)
downloadopenshift-551dccac66421664a87de523c0e3cc2a6392beb9.tar.gz
openshift-551dccac66421664a87de523c0e3cc2a6392beb9.tar.bz2
openshift-551dccac66421664a87de523c0e3cc2a6392beb9.tar.xz
openshift-551dccac66421664a87de523c0e3cc2a6392beb9.zip
Merge pull request #74 from detiber/ssl2
Additional changes for SSL enabling the api and console ports
Diffstat (limited to 'roles/base_os')
-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..2bb2b4ec7 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=/var/lib/openshift/openshift.local.certificates/admin/.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