summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-10-05 09:26:52 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-10-05 09:26:52 -0400
commit7918909dc7c6877a4ce2b9fab830d0c41c1c92fd (patch)
tree5dc2cb028bddf76e98ff53d333535212d6fd8b3b /roles
parentc443f3fc1b901b72a58e0e28b5a280cec205cbbd (diff)
parent59fb7879501d702bb78a1d79326408b115a63c90 (diff)
downloadopenshift-7918909dc7c6877a4ce2b9fab830d0c41c1c92fd.tar.gz
openshift-7918909dc7c6877a4ce2b9fab830d0c41c1c92fd.tar.bz2
openshift-7918909dc7c6877a4ce2b9fab830d0c41c1c92fd.tar.xz
openshift-7918909dc7c6877a4ce2b9fab830d0c41c1c92fd.zip
Merge pull request #641 from menren/gce-support
GCE support
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_facts/tasks/main.yml2
-rw-r--r--roles/openshift_manage_node/tasks/main.yml2
-rw-r--r--roles/openshift_node/tasks/main.yml2
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index fd3d20800..6301d4fc0 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -1,5 +1,5 @@
---
-- name: Verify Ansible version is greater than 1.8.0 and not 1.9.0
+- name: Verify Ansible version is greater than 1.8.0 and not 1.9.0 and not 1.9.0.1
assert:
that:
- ansible_version | version_compare('1.8.0', 'ge')
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index 7c4f45ce6..94d7879b2 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -3,7 +3,7 @@
{{ openshift.common.client_binary }} get node {{ item }}
register: omd_get_node
until: omd_get_node.rc == 0
- retries: 10
+ retries: 20
delay: 5
with_items: openshift_nodes
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) }}"