diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-07-05 14:37:26 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-07-05 14:37:26 -0400 |
| commit | 812e6695208dfb3f29b2c95c7814c2c007022f30 (patch) | |
| tree | b2ae578bc3d37c673766fed9e4807ccccf97e3b1 | |
| parent | 87094cf3c43143a4501e3512dfe589d0d081df50 (diff) | |
| download | openshift-812e6695208dfb3f29b2c95c7814c2c007022f30.tar.gz openshift-812e6695208dfb3f29b2c95c7814c2c007022f30.tar.bz2 openshift-812e6695208dfb3f29b2c95c7814c2c007022f30.tar.xz openshift-812e6695208dfb3f29b2c95c7814c2c007022f30.zip | |
Removed quotes and added env variable to be specific.
| -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 858d11724..a6b512341 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -132,13 +132,13 @@ # This is an ugly hack to verify settings are in a file without modifying them with lineinfile. # The template file will stomp any other settings made. - 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" + command: "awk '/^OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000/' /etc/sysconfig/{{ openshift.common.service_type }}-master" ignore_errors: true 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('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 | match('OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000')) }}" - name: Install the systemd units include: systemd_units.yml |