From 1932b8d007792e29c609099708224c6a4e29288e Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Fri, 20 Feb 2015 11:43:19 -0500
Subject: 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).
---
roles/base_os/tasks/main.yaml | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
(limited to 'roles/base_os')
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
--
cgit v1.2.3
From a22471f1e1f4fe84340976d40d02ea13bf801441 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Fri, 20 Feb 2015 12:55:33 -0500
Subject: Use the full path for the kubeconfig
---
roles/base_os/tasks/main.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'roles/base_os')
diff --git a/roles/base_os/tasks/main.yaml b/roles/base_os/tasks/main.yaml
index b18f5c40d..2bb2b4ec7 100644
--- a/roles/base_os/tasks/main.yaml
+++ b/roles/base_os/tasks/main.yaml
@@ -15,7 +15,7 @@
lineinfile:
dest: /root/.bash_profile
regexp: "KUBECONFIG="
- line: "export KUBECONFIG={{ openshift_master_credentials_dir }}.kubeconfig"
+ line: "export KUBECONFIG=/var/lib/openshift/openshift.local.certificates/admin/.kubeconfig"
state: present
insertafter: EOF
--
cgit v1.2.3