summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-03-03 14:26:35 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-03-06 15:47:51 -0500
commit7d4e808d6ded0d4208c27da7b6443969f7b09d20 (patch)
tree88b362330df6bca6054f03c7793d1cc88da37668
parent3aed7219448ab99377643c71d05f2a26b6e11c99 (diff)
downloadopenshift-7d4e808d6ded0d4208c27da7b6443969f7b09d20.tar.gz
openshift-7d4e808d6ded0d4208c27da7b6443969f7b09d20.tar.bz2
openshift-7d4e808d6ded0d4208c27da7b6443969f7b09d20.tar.xz
openshift-7d4e808d6ded0d4208c27da7b6443969f7b09d20.zip
Provide default value for openshift_node_ips
- openshift_node_ips now defaults to [] - Previously an empty --nodes in /etc/sysconfig/master would result in the master creating a node for the localhost. The latest Origin and OSE builds now only create the implicit localhost node if run as openshift, not openshift-master. We can now safely default to setting no nodes in /etc/sysconfig/master and having nodes register themselves with the master when they come up via the 'Register node (if not already registered)' task in roles/openshift_node/tasks/main.yml) - This had an associated change for the byo scripts that had not been merged into master yet, but this PR changes the behavior of the openshift_master role to not fail if openshift_node_ips is not set. This also prevents having the openshift_master service restarted when a node is added.
-rw-r--r--roles/openshift_master/defaults/main.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index 3c941089c..10875da8e 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -1,3 +1,4 @@
---
openshift_master_manage_service_externally: false
openshift_master_debug_level: "{{ openshift_debug_level | default(0) }}"
+openshift_node_ips: []