summaryrefslogtreecommitdiffstats
path: root/roles/openshift_registry/tasks
diff options
context:
space:
mode:
authorStefanie Forrester <sedgar@redhat.com>2015-09-11 13:13:17 -0700
committerStefanie Forrester <sedgar@redhat.com>2015-10-21 12:55:42 -0400
commit8691cd2947146a24237fadc443eb02acf805a606 (patch)
tree0aee79ec29eab0d36ea9b2f13f079bbb259dcc77 /roles/openshift_registry/tasks
parent0b89d53ad9c0c83c42db3ee1642c005474c3cc58 (diff)
downloadopenshift-8691cd2947146a24237fadc443eb02acf805a606.tar.gz
openshift-8691cd2947146a24237fadc443eb02acf805a606.tar.bz2
openshift-8691cd2947146a24237fadc443eb02acf805a606.tar.xz
openshift-8691cd2947146a24237fadc443eb02acf805a606.zip
Support HA or single router, and start work on registry
Diffstat (limited to 'roles/openshift_registry/tasks')
-rw-r--r--roles/openshift_registry/tasks/main.yml11
1 files changed, 7 insertions, 4 deletions
diff --git a/roles/openshift_registry/tasks/main.yml b/roles/openshift_registry/tasks/main.yml
index 29387d7d5..749eea5c0 100644
--- a/roles/openshift_registry/tasks/main.yml
+++ b/roles/openshift_registry/tasks/main.yml
@@ -1,11 +1,14 @@
---
-- set_fact: _oreg_images="--images={{ oreg_url|quote }}"
- when: oreg_url is defined
+# This role is unused until we add options for configuring the backend storage
+
+- set_fact: _oreg_images="--images='{{ openshift.master.registry_url }}'"
+
+- set_fact: _oreg_selector="--selector='{{ openshift.master.registry_selector }}'"
- name: Deploy OpenShift Registry
command: >
{{ openshift.common.admin_binary }} registry
- --create
- --credentials={{ openshift_master_config_dir }}/openshift-registry.kubeconfig {{ _oreg_images|default() }}
+ --create --service-account=registry {{ _oreg_selector }}
+ --credentials={{ openshift_master_config_dir }}/openshift-registry.kubeconfig {{ _oreg_images }}
register: _oreg_results
changed_when: "'service exists' not in _oreg_results.stdout"