diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-10-21 15:23:30 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-10-21 15:23:30 -0400 |
| commit | 9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6 (patch) | |
| tree | 315c8752e2527fb71dc389b254393977d44a7074 /roles/openshift_registry/tasks | |
| parent | edfd8dc450854d6f2efa6c3d67e856b66b3743fd (diff) | |
| parent | 8691cd2947146a24237fadc443eb02acf805a606 (diff) | |
| download | openshift-9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6.tar.gz openshift-9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6.tar.bz2 openshift-9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6.tar.xz openshift-9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6.zip | |
Merge pull request #571 from dak1n1/router
Support HA or single router. Deploy after service accounts are created
Diffstat (limited to 'roles/openshift_registry/tasks')
| -rw-r--r-- | roles/openshift_registry/tasks/main.yml | 11 |
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" |