Merge pull request #4918 from sdodson/fix-sysconfig-check

Merged by openshift-bot
openshift · Jul 28, 2017 · b5850e6 · b5850e6
2 parents 841ec23 + fbb5f4c
commit b5850e6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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: