diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-28 18:16:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-28 18:16:58 -0400 |
| commit | b5850e6cae2998e83702f2562ab32d1a1687a572 (patch) | |
| tree | 4f5eb4dff62051e8f28c2826c553c14dc2f15477 | |
| parent | 841ec238782aa382eed3d69ce6a2af62a82bfd43 (diff) | |
| parent | fbb5f4c002d5cb96d4d86abe33344468f8fda95b (diff) | |
| download | openshift-b5850e6cae2998e83702f2562ab32d1a1687a572.tar.gz openshift-b5850e6cae2998e83702f2562ab32d1a1687a572.tar.bz2 openshift-b5850e6cae2998e83702f2562ab32d1a1687a572.tar.xz openshift-b5850e6cae2998e83702f2562ab32d1a1687a572.zip | |
Merge pull request #4918 from sdodson/fix-sysconfig-check
Merged by openshift-bot
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 0c4ee319c..1f182a25c 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -133,12 +133,12 @@ - block: - name: check whether our docker-registry setting exists in the env file command: "awk '/^OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000/' /etc/sysconfig/{{ openshift.common.service_type }}-master" - ignore_errors: true + failed_when: false changed_when: false register: already_set - set_fact: - openshift_push_via_dns: "{{ (openshift_use_dnsmasq | default(true) and openshift.common.version_gte_3_6) or (already_set.stdout | match('OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000')) }}" + openshift_push_via_dns: "{{ (openshift_use_dnsmasq | default(true) and openshift.common.version_gte_3_6) or (already_set.stdout is defined and already_set.stdout | match('OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000')) }}" - name: Set fact of all etcd host IPs openshift_facts: |