diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-17 21:38:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 21:38:40 -0500 |
| commit | e5a319cf8c7cc6d36ddb9fdc9e69e9dd1b8eb3f5 (patch) | |
| tree | 24eca23c9db955d222dbfced7091e7704a1af218 | |
| parent | b342f3f6bc1817ac62f0c053d28125a991126114 (diff) | |
| parent | 94d049c4f1537b204d513acb6eb6041a35c9322e (diff) | |
| download | openshift-e5a319cf8c7cc6d36ddb9fdc9e69e9dd1b8eb3f5.tar.gz openshift-e5a319cf8c7cc6d36ddb9fdc9e69e9dd1b8eb3f5.tar.bz2 openshift-e5a319cf8c7cc6d36ddb9fdc9e69e9dd1b8eb3f5.tar.xz openshift-e5a319cf8c7cc6d36ddb9fdc9e69e9dd1b8eb3f5.zip | |
Merge pull request #6076 from abutcher/bz1511357
Bug 1511357: Task "Reload generated facts" failed while scaling up containerized masters
| -rw-r--r-- | playbooks/openshift-loadbalancer/private/config.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_ca/tasks/main.yml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/playbooks/openshift-loadbalancer/private/config.yml b/playbooks/openshift-loadbalancer/private/config.yml index 54c8483c8..4a83dd955 100644 --- a/playbooks/openshift-loadbalancer/private/config.yml +++ b/playbooks/openshift-loadbalancer/private/config.yml @@ -24,7 +24,7 @@ openshift_use_nuage | default(false), nuage_mon_rest_server_port | default(none))) + openshift_loadbalancer_additional_backends | default([]) }}" - openshift_image_tag: "{{ hostvars[groups.oo_first_master.0].openshift_image_tag }}" + openshift_image_tag: "{{ hostvars[groups.oo_masters_to_config.0].openshift_image_tag }}" roles: - role: openshift_loadbalancer - role: tuned diff --git a/roles/openshift_ca/tasks/main.yml b/roles/openshift_ca/tasks/main.yml index b94cd9fba..9c8534c74 100644 --- a/roles/openshift_ca/tasks/main.yml +++ b/roles/openshift_ca/tasks/main.yml @@ -19,7 +19,8 @@ - name: Reload generated facts openshift_facts: - when: hostvars[openshift_ca_host].install_result is changed + when: + - hostvars[openshift_ca_host].install_result | default({'changed':false}) is changed - name: Create openshift_ca_config_dir if it does not exist file: |