summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-02 16:24:59 -0500
committerGitHub <noreply@github.com>2017-03-02 16:24:59 -0500
commita101d9e8a2a746faa2fce6f5849d9a01585e0485 (patch)
tree3f6e7df3fce4ba5f4029c8cf1e3f0b54a5761337 /roles
parent6eeceffad2d296d8e4c9a14de3c8e831e438e24c (diff)
parent33bc830837735f2b18ca72b0a3891547abd17dba (diff)
downloadopenshift-a101d9e8a2a746faa2fce6f5849d9a01585e0485.tar.gz
openshift-a101d9e8a2a746faa2fce6f5849d9a01585e0485.tar.bz2
openshift-a101d9e8a2a746faa2fce6f5849d9a01585e0485.tar.xz
openshift-a101d9e8a2a746faa2fce6f5849d9a01585e0485.zip
Merge pull request #3538 from mtnbikenc/bugfix-hosted-registry
Correct config for hosted registry
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_hosted/tasks/registry/registry.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml
index 39e7de230..d89ce855a 100644
--- a/roles/openshift_hosted/tasks/registry/registry.yml
+++ b/roles/openshift_hosted/tasks/registry/registry.yml
@@ -56,6 +56,13 @@
openshift_hosted_registry_force:
- False
+- name: oc adm policy add-cluster-role-to-user system:registry system:serviceaccount:default:registry
+ oc_adm_policy_user:
+ user: system:serviceaccount:default:registry
+ resource_kind: cluster-role
+ resource_name: system:registry
+ state: present
+
- name: create the default registry service
oc_service:
namespace: "{{ openshift_hosted_registry_namespace }}"
@@ -65,7 +72,8 @@
port: 5000
protocol: TCP
targetPort: 5000
- selector: "{{ openshift_hosted_registry_selector }}"
+ selector:
+ docker-registry: default
session_affinity: ClientIP
service_type: ClusterIP