diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-02-13 20:09:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 20:09:19 +0100 |
| commit | 671062646c9a409470be374408f104352af825f0 (patch) | |
| tree | 49c731b179aa83e991fa071502738c1ce95064ef /roles | |
| parent | d9a6627ac9e019f699b749f427e107514f96d9b0 (diff) | |
| parent | c96cbe38a9dfd08909687b347dc00a18a894b235 (diff) | |
| download | openshift-671062646c9a409470be374408f104352af825f0.tar.gz openshift-671062646c9a409470be374408f104352af825f0.tar.bz2 openshift-671062646c9a409470be374408f104352af825f0.tar.xz openshift-671062646c9a409470be374408f104352af825f0.zip | |
Merge pull request #3306 from ingvagabund/oc_service
replace 'oc service' command with its lib_openshift equivalent
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/secure.yml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/roles/openshift_hosted/tasks/registry/secure.yml b/roles/openshift_hosted/tasks/registry/secure.yml index 216a40874..556da5304 100644 --- a/roles/openshift_hosted/tasks/registry/secure.yml +++ b/roles/openshift_hosted/tasks/registry/secure.yml @@ -20,11 +20,10 @@ failed_when: false - name: Retrieve registry service IP - command: > - {{ openshift.common.client_binary }} get service docker-registry - -o jsonpath='{.spec.clusterIP}' - --config={{ openshift_hosted_kubeconfig }} - -n default + oc_service: + namespace: default + name: docker-registry + state: list register: docker_registry_service_ip changed_when: false @@ -37,7 +36,7 @@ --signer-cert={{ openshift_master_config_dir }}/ca.crt --signer-key={{ openshift_master_config_dir }}/ca.key --signer-serial={{ openshift_master_config_dir }}/ca.serial.txt - --hostnames="{{ docker_registry_service_ip.stdout }},docker-registry.default.svc.cluster.local,{{ docker_registry_route_hostname }}" + --hostnames="{{ docker_registry_service_ip.results.clusterip }},docker-registry.default.svc.cluster.local,{{ docker_registry_route_hostname }}" --cert={{ openshift_master_config_dir }}/registry.crt --key={{ openshift_master_config_dir }}/registry.key when: False in (docker_registry_certificates_stat_result.results | default([]) | oo_collect(attribute='stat.exists') | list) |