summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted/tasks
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-02-08 17:31:53 -0500
committerSteve Milner <smilner@redhat.com>2017-02-10 16:28:30 -0500
commita064a673ae40a4c5a62b6bf2d619d72bbc5fd967 (patch)
tree6a0ecc9736a6a83caca4920aa298b3c44815c665 /roles/openshift_hosted/tasks
parent07ca54fe406a533e70350aa9273d5a3df297f156 (diff)
downloadopenshift-a064a673ae40a4c5a62b6bf2d619d72bbc5fd967.tar.gz
openshift-a064a673ae40a4c5a62b6bf2d619d72bbc5fd967.tar.bz2
openshift-a064a673ae40a4c5a62b6bf2d619d72bbc5fd967.tar.xz
openshift-a064a673ae40a4c5a62b6bf2d619d72bbc5fd967.zip
oc secrets now done via oc_secret module
Diffstat (limited to 'roles/openshift_hosted/tasks')
-rw-r--r--roles/openshift_hosted/tasks/registry/secure.yml19
1 files changed, 11 insertions, 8 deletions
diff --git a/roles/openshift_hosted/tasks/registry/secure.yml b/roles/openshift_hosted/tasks/registry/secure.yml
index d87a3847c..8aabb9f17 100644
--- a/roles/openshift_hosted/tasks/registry/secure.yml
+++ b/roles/openshift_hosted/tasks/registry/secure.yml
@@ -43,15 +43,18 @@
when: False in (docker_registry_certificates_stat_result.results | default([]) | oo_collect(attribute='stat.exists') | list)
- name: Create the secret for the registry certificates
- command: >
- {{ openshift.common.client_binary }} secrets new registry-certificates
- {{ openshift_master_config_dir }}/registry.crt
- {{ openshift_master_config_dir }}/registry.key
- --config={{ openshift_hosted_kubeconfig }}
- -n default
+ oc_secret:
+ kubeconfig: "{{ openshift_hosted_kubeconfig }}"
+ name: registry-certificates
+ namespace: default
+ state: present
+ files:
+ - name: registry.crt
+ path: "{{ openshift_master_config_dir }}/registry.crt"
+ - name: registry.key
+ path: "{{ openshift_master_config_dir }}/registry.key"
register: create_registry_certificates_secret
- changed_when: "'already exists' not in create_registry_certificates_secret.stderr"
- failed_when: "'already exists' not in create_registry_certificates_secret.stderr and create_registry_certificates_secret.rc != 0"
+ run_once: true
- name: "Add the secret to the registry's pod service accounts"
command: >