diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-27 21:26:14 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-07-27 21:26:37 -0400 |
| commit | fbb5f4c002d5cb96d4d86abe33344468f8fda95b (patch) | |
| tree | 9b889f1fc1e977bec78a64cc88d593f3e5e4737c /roles | |
| parent | f0e804d2a23d0abf1fd8a2f84673ed69baece194 (diff) | |
| download | openshift-fbb5f4c002d5cb96d4d86abe33344468f8fda95b.tar.gz openshift-fbb5f4c002d5cb96d4d86abe33344468f8fda95b.tar.bz2 openshift-fbb5f4c002d5cb96d4d86abe33344468f8fda95b.tar.xz openshift-fbb5f4c002d5cb96d4d86abe33344468f8fda95b.zip | |
Tolerate non existence of /etc/sysconfig/atomic-openshift-master
Diffstat (limited to 'roles')
| -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: |