summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-10-05 13:49:08 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-10-05 13:49:08 -0400
commit9fd4af295a7c88b4c112b9bd500e396a766b3dc0 (patch)
treec86ab69cda7d6a1402c779968bb20b41c8fd4012 /roles/openshift_node
parent7918909dc7c6877a4ce2b9fab830d0c41c1c92fd (diff)
parent3073d1f729f9dcd202088f6b318b465567c6344b (diff)
downloadopenshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.gz
openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.bz2
openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.xz
openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.zip
Merge pull request #654 from openshift/revert-641-gce-support
Revert "GCE support" because it breaks openstack.
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 96cd96315..e8cc499c0 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -22,7 +22,7 @@
deployment_type: "{{ openshift_deployment_type }}"
- role: node
local_facts:
- labels: "{{ lookup('oo_option', 'openshift_node_labels') | default( openshift_node_labels | default() ) }}"
+ labels: "{{ openshift_node_labels | default(none) }}"
annotations: "{{ openshift_node_annotations | default(none) }}"
registry_url: "{{ oreg_url | default(none) }}"
debug_level: "{{ openshift_node_debug_level | default(openshift.common.debug_level) }}"