summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWesley Hearn <whearn@redhat.com>2015-07-27 16:26:17 -0400
committerWesley Hearn <whearn@redhat.com>2015-07-27 16:26:17 -0400
commit8bdaac7f60a5826b8e8518a6f8ded737bd713f82 (patch)
treed109d1f00b35755993e14c2e13323e49772b1241
parent274aa30b1af218031c0c6e7d3abe2ab732dc5b59 (diff)
downloadopenshift-8bdaac7f60a5826b8e8518a6f8ded737bd713f82.tar.gz
openshift-8bdaac7f60a5826b8e8518a6f8ded737bd713f82.tar.bz2
openshift-8bdaac7f60a5826b8e8518a6f8ded737bd713f82.tar.xz
openshift-8bdaac7f60a5826b8e8518a6f8ded737bd713f82.zip
Setup openshift-node on the masters so that the web console can access the pods
-rw-r--r--playbooks/aws/openshift-cluster/config.yml1
-rw-r--r--playbooks/common/openshift-cluster/config.yml9
2 files changed, 10 insertions, 0 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml
index 6ee539c7e..8106d5da9 100644
--- a/playbooks/aws/openshift-cluster/config.yml
+++ b/playbooks/aws/openshift-cluster/config.yml
@@ -15,6 +15,7 @@
g_nodes_group: "{{ 'tag_env-host-type_' ~ cluster_id ~ '-openshift-node' }}"
g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}"
g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"
+ g_nodeonmaster: true
openshift_cluster_id: "{{ cluster_id }}"
openshift_debug_level: 4
openshift_deployment_type: "{{ deployment_type }}"
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 0779cfe47..4c74f96db 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -39,6 +39,15 @@
ansible_sudo: "{{ g_sudo | default(omit) }}"
with_items: groups[g_nodes_group] | default([])
+ - name: Evaluate oo_nodes_to_config
+ add_host:
+ name: "{{ item }}"
+ groups: oo_nodes_to_config
+ ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
+ ansible_sudo: "{{ g_sudo | default(omit) }}"
+ with_items: groups[g_masters_group] | default([])
+ when: g_nodeonmaster is defined and g_nodeonmaster == true
+
- name: Evaluate oo_first_etcd
add_host:
name: "{{ groups[g_etcd_group][0] }}"