summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-09-18 09:59:27 -0400
committerMichael Gugino <mgugino@redhat.com>2017-09-18 10:04:55 -0400
commit7496ad209943822c34956fa9451ced993207ce3e (patch)
treef52a951fcee8d8ab4339a915105a544b641ae861 /roles/openshift_master
parentb124c678a9ac8c723f3576a03276de7cfd051931 (diff)
downloadopenshift-7496ad209943822c34956fa9451ced993207ce3e.tar.gz
openshift-7496ad209943822c34956fa9451ced993207ce3e.tar.bz2
openshift-7496ad209943822c34956fa9451ced993207ce3e.tar.xz
openshift-7496ad209943822c34956fa9451ced993207ce3e.zip
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
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml4
1 files changed, 2 insertions, 2 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