diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-07-06 09:17:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-06 09:17:48 -0400 |
commit | d7555610630edff19a42c6bed1b9d5ceadf09273 (patch) | |
tree | b2b8d3c969688081705cfd9ac3f4879873abf9aa /roles/openshift_master | |
parent | 137926057549032a69150fccb2ff6b5936b39161 (diff) | |
parent | 2e87ad012bed336db27735d5f75ff872970774fe (diff) | |
download | openshift-d7555610630edff19a42c6bed1b9d5ceadf09273.tar.gz openshift-d7555610630edff19a42c6bed1b9d5ceadf09273.tar.bz2 openshift-d7555610630edff19a42c6bed1b9d5ceadf09273.tar.xz openshift-d7555610630edff19a42c6bed1b9d5ceadf09273.zip |
Merge pull request #4691 from sdodson/fix-travis
Fix yamllint
Diffstat (limited to 'roles/openshift_master')
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index a6b512341..9b7125240 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -128,17 +128,17 @@ when: openshift.master.request_header_ca is defined and item.kind == 'RequestHeaderIdentityProvider' and item.clientCA | default('') != '' with_items: "{{ openshift.master.identity_providers }}" +# 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. - block: - # 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" - 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('OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000')) }}" + - 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 + 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')) }}" - name: Install the systemd units include: systemd_units.yml |