diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-10-12 14:37:44 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-10-12 14:37:44 -0400 |
| commit | 35476982e1d0dc1851c102ab3b6aec0b9b6a1637 (patch) | |
| tree | 0d7de94740f3fafe9eeb9754d5d438036f35e15a /roles | |
| parent | 8e776b09cb38c6f02aa4b3c75c9343e73fb96691 (diff) | |
| parent | a8171a639bd4500f30e72233587e9f6335202438 (diff) | |
| download | openshift-35476982e1d0dc1851c102ab3b6aec0b9b6a1637.tar.gz openshift-35476982e1d0dc1851c102ab3b6aec0b9b6a1637.tar.bz2 openshift-35476982e1d0dc1851c102ab3b6aec0b9b6a1637.tar.xz openshift-35476982e1d0dc1851c102ab3b6aec0b9b6a1637.zip | |
Merge pull request #658 from menren/gce-support
GCE-support
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 2 |
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 c6c7cd49e..637e494ea 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 | lower }} 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..d45dd8073 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(none), true) }}" annotations: "{{ openshift_node_annotations | default(none) }}" registry_url: "{{ oreg_url | default(none) }}" debug_level: "{{ openshift_node_debug_level | default(openshift.common.debug_level) }}" |