diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-02 06:19:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 06:19:06 -0800 |
| commit | 3e2c7c22a54a3ccf88b49742003a3a4a937683f8 (patch) | |
| tree | 015acc050e865872a03700974cb73fa47c9dc940 /roles/openshift_master/tasks/main.yml | |
| parent | 22462aa17098116660d4600c9a1e87cd3ad40698 (diff) | |
| parent | 8e0b7761a128a4851db439b9597869b17b6174b1 (diff) | |
| download | openshift-3e2c7c22a54a3ccf88b49742003a3a4a937683f8.tar.gz openshift-3e2c7c22a54a3ccf88b49742003a3a4a937683f8.tar.bz2 openshift-3e2c7c22a54a3ccf88b49742003a3a4a937683f8.tar.xz openshift-3e2c7c22a54a3ccf88b49742003a3a4a937683f8.zip | |
Merge pull request #6851 from kwoodson/upgrade_dns_push
Automatic merge from submit-queue.
Upgrade to migrate to using push to DNS for registries.
This is the beginning of the migration to push to docker-registry by DNS. This migrates users by rerolling their certificates and then redeploying the registry so that hosts can push to the registries with the newly created certificates.
Diffstat (limited to 'roles/openshift_master/tasks/main.yml')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 41f2ee2a5..680e4a4ff 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -137,17 +137,8 @@ - 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: - - 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_service_type }}-master" - failed_when: false - changed_when: false - register: l_already_set - - - set_fact: - openshift_push_via_dns: "{{ openshift.common.version_gte_3_6 or (l_already_set.stdout is defined and l_already_set.stdout is match('OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000')) }}" +- name: Include push_via_dns.yml + include_tasks: push_via_dns.yml - name: Set fact of all etcd host IPs openshift_facts: |