diff options
| author | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-06 16:59:00 +0200 |
|---|---|---|
| committer | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-06 16:59:00 +0200 |
| commit | a3ba0278879075e14373a6872acc5f0c3cc3d9a2 (patch) | |
| tree | 3c0a829dabf217cbabb77075153664e869d4bcda /roles/openshift_node | |
| parent | 071eee9acb80621919dda2a07f9fe9c56dcfda27 (diff) | |
| download | openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.tar.gz openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.tar.bz2 openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.tar.xz openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.zip | |
Revert "Revert "GCE support""
This reverts commit 3073d1f729f9dcd202088f6b318b465567c6344b.
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index e8cc499c0..96cd96315 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: "{{ openshift_node_labels | default(none) }}" + labels: "{{ lookup('oo_option', 'openshift_node_labels') | default( openshift_node_labels | default() ) }}" annotations: "{{ openshift_node_annotations | default(none) }}" registry_url: "{{ oreg_url | default(none) }}" debug_level: "{{ openshift_node_debug_level | default(openshift.common.debug_level) }}" |