summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-02-11 10:06:42 +0100
committerGitHub <noreply@github.com>2017-02-11 10:06:42 +0100
commit9d25cb0280664f8bdef6247c8dc13520c90756da (patch)
treedd4d1022288e0d2f8ef805459230a724a3b49ca5 /playbooks
parent7c948bc637480e6d292b8af18b7a4c90b71d747c (diff)
parentb0f065dde8ddf14a8712a769152e63faea6688a3 (diff)
downloadopenshift-9d25cb0280664f8bdef6247c8dc13520c90756da.tar.gz
openshift-9d25cb0280664f8bdef6247c8dc13520c90756da.tar.bz2
openshift-9d25cb0280664f8bdef6247c8dc13520c90756da.tar.xz
openshift-9d25cb0280664f8bdef6247c8dc13520c90756da.zip
Merge pull request #3307 from ingvagabund/oc_serviceaccount_secret
Replace service account secrets handling with oc_serviceaccount_secret module
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/adhoc/s3_registry/s3_registry.yml13
1 files changed, 8 insertions, 5 deletions
diff --git a/playbooks/adhoc/s3_registry/s3_registry.yml b/playbooks/adhoc/s3_registry/s3_registry.yml
index 2c79a1b4d..d6758dae5 100644
--- a/playbooks/adhoc/s3_registry/s3_registry.yml
+++ b/playbooks/adhoc/s3_registry/s3_registry.yml
@@ -51,13 +51,16 @@
command: oc secrets new dockerregistry /root/config.yml
when: "'dockerregistry' not in secrets.stdout"
- - name: Determine if service account contains secrets
- command: oc describe serviceaccount/registry
- register: serviceaccount
+ - name: Load lib_openshift modules
+ include_role:
+ name: lib_openshift
- name: Add secrets to registry service account
- command: oc secrets add serviceaccount/registry secrets/dockerregistry
- when: "'dockerregistry' not in serviceaccount.stdout"
+ oc_serviceaccount_secret:
+ service_account: registry
+ secret: dockerregistry
+ namespace: default
+ state: present
- name: Determine if deployment config contains secrets
command: oc volume dc/docker-registry --list