diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-24 14:29:14 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-24 14:29:14 -0500 |
| commit | 4591db0eb0ac70599293fbbce65cf402e0ec1bc1 (patch) | |
| tree | 4a806c541d9738b708d9319ace64cb21f51ce682 /roles/openshift_facts/library | |
| parent | f464177c264ef87af80ac023e2698a466b723325 (diff) | |
| parent | 42232eb59cc3c6ae5d4733b6655add0aff23217b (diff) | |
| download | openshift-4591db0eb0ac70599293fbbce65cf402e0ec1bc1.tar.gz openshift-4591db0eb0ac70599293fbbce65cf402e0ec1bc1.tar.bz2 openshift-4591db0eb0ac70599293fbbce65cf402e0ec1bc1.tar.xz openshift-4591db0eb0ac70599293fbbce65cf402e0ec1bc1.zip | |
Merge pull request #970 from detiber/nodeIP
Conditionally set the nodeIP
Diffstat (limited to 'roles/openshift_facts/library')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 6006bfa9d..b60e42c71 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1074,7 +1074,7 @@ class OpenShiftFacts(object): if 'node' in roles: node = dict(labels={}, annotations={}, portal_net='172.30.0.0/16', - iptables_sync_period='5s') + iptables_sync_period='5s', set_node_ip=False) defaults['node'] = node return defaults |