diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-06-11 13:23:07 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-06-11 13:23:07 -0400 |
| commit | 42806b6745c747843b71eaf08b62aeee5e450ab1 (patch) | |
| tree | 3e1f882f5bc7fe419f13a134a71927cb6484fa86 /roles/openshift_registry | |
| parent | b170dd1d5d3b3ff87795a64b77c312c79623444c (diff) | |
| parent | 34278f136fb3471ecaa59f42033f00f76c390647 (diff) | |
| download | openshift-42806b6745c747843b71eaf08b62aeee5e450ab1.tar.gz openshift-42806b6745c747843b71eaf08b62aeee5e450ab1.tar.bz2 openshift-42806b6745c747843b71eaf08b62aeee5e450ab1.tar.xz openshift-42806b6745c747843b71eaf08b62aeee5e450ab1.zip | |
Merge pull request #248 from detiber/configTemplates
Config templates
Diffstat (limited to 'roles/openshift_registry')
| -rw-r--r-- | roles/openshift_registry/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_registry/vars/main.yml | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/roles/openshift_registry/tasks/main.yml b/roles/openshift_registry/tasks/main.yml index 7e6982d99..29387d7d5 100644 --- a/roles/openshift_registry/tasks/main.yml +++ b/roles/openshift_registry/tasks/main.yml @@ -3,6 +3,9 @@ when: oreg_url is defined - name: Deploy OpenShift Registry - command: openshift admin registry --create --credentials=/var/lib/openshift/openshift.local.certificates/openshift-registry/.kubeconfig {{ _oreg_images|default() }} + command: > + {{ openshift.common.admin_binary }} registry + --create + --credentials={{ openshift_master_config_dir }}/openshift-registry.kubeconfig {{ _oreg_images|default() }} register: _oreg_results changed_when: "'service exists' not in _oreg_results.stdout" diff --git a/roles/openshift_registry/vars/main.yml b/roles/openshift_registry/vars/main.yml index cd21505a4..9fb501e85 100644 --- a/roles/openshift_registry/vars/main.yml +++ b/roles/openshift_registry/vars/main.yml @@ -1,2 +1,3 @@ --- +openshift_master_config_dir: /etc/openshift/master |