diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-18 19:57:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-18 19:57:53 -0700 |
| commit | fa9d0ee3e14918fda9ba63ade91bf1d6ed5d5a0f (patch) | |
| tree | 249ff4c65027b4788019bfcee5e680c97708350a | |
| parent | a8e02600fa0dc03aa85c4b103f2b79b963be19e4 (diff) | |
| parent | 7496ad209943822c34956fa9451ced993207ce3e (diff) | |
| download | openshift-fa9d0ee3e14918fda9ba63ade91bf1d6ed5d5a0f.tar.gz openshift-fa9d0ee3e14918fda9ba63ade91bf1d6ed5d5a0f.tar.bz2 openshift-fa9d0ee3e14918fda9ba63ade91bf1d6ed5d5a0f.tar.xz openshift-fa9d0ee3e14918fda9ba63ade91bf1d6ed5d5a0f.zip | |
Merge pull request #5441 from mgugino-upstream-stage/fix-reg-auth
Automatic merge from submit-queue
Fix registry auth task ordering
Currently, registry authentication credentials are not
produced until after docker systemd service files are
created.
This commit ensures the credentials are
created before the systemd service files to ensure
the proper boolean is set to include the read-only
mount of credentials inside containerized nodes and
masters.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 894fe8e2b..1fe0e94b1 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -177,6 +177,8 @@ local_facts: no_proxy_etcd_host_ips: "{{ openshift_no_proxy_etcd_host_ips }}" +- include: registry_auth.yml + - name: Install the systemd units include: systemd_units.yml @@ -229,8 +231,6 @@ - restart master controllers when: openshift_master_bootstrap_enabled | default(False) -- include: registry_auth.yml - - include: set_loopback_context.yml when: - openshift.common.version_gte_3_2_or_1_2 diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 28238a8fa..ef79b6ac0 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -69,12 +69,12 @@ include: bootstrap.yml when: openshift_node_bootstrap +- include: registry_auth.yml + - name: include standard node config include: config.yml when: not openshift_node_bootstrap -- include: registry_auth.yml - - name: Configure AWS Cloud Provider Settings lineinfile: dest: /etc/sysconfig/{{ openshift.common.service_type }}-node |