summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-02-24 22:26:17 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-02-24 23:10:37 -0500
commite05290c71fe0f7637ac47950112a6644b8fdeaf0 (patch)
tree52fcdb5bb3a9c078dd720859f1d3a74abaa081b9
parent4ac06057c9a77626bb181c22a5f1adc8014b13d2 (diff)
downloadopenshift-e05290c71fe0f7637ac47950112a6644b8fdeaf0.tar.gz
openshift-e05290c71fe0f7637ac47950112a6644b8fdeaf0.tar.bz2
openshift-e05290c71fe0f7637ac47950112a6644b8fdeaf0.tar.xz
openshift-e05290c71fe0f7637ac47950112a6644b8fdeaf0.zip
move KUBECONFIG setting to openshift_common
-rw-r--r--roles/base_os/tasks/main.yaml8
-rw-r--r--roles/openshift_common/tasks/main.yml8
2 files changed, 8 insertions, 8 deletions
diff --git a/roles/base_os/tasks/main.yaml b/roles/base_os/tasks/main.yaml
index 448221cfb..51fe1e5b6 100644
--- a/roles/base_os/tasks/main.yaml
+++ b/roles/base_os/tasks/main.yaml
@@ -11,14 +11,6 @@
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:
pkg: bash-completion
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index 9043c3d8e..cfa0d8dfe 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -12,3 +12,11 @@
- { section: common, option: env, value: "{{ openshift_env | default('default') }}" }
- { section: common, option: host_type, value: "{{ openshift_host_type }}" }
- { 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