diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-04 13:25:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 13:25:21 -0700 |
| commit | 9929c67a7011027b1e9fc467d7ca0992a0329ab0 (patch) | |
| tree | eab98ff0c970fd23698fb41dd0d6b7c9e945ad32 /roles/lib_openshift/src/doc/secret | |
| parent | b11783ab2a9fcb88067d631468e3750fcddc67b3 (diff) | |
| parent | 7d8d21b7a5170fa3b187d7afe6d010a2e888fe74 (diff) | |
| download | openshift-9929c67a7011027b1e9fc467d7ca0992a0329ab0.tar.gz openshift-9929c67a7011027b1e9fc467d7ca0992a0329ab0.tar.bz2 openshift-9929c67a7011027b1e9fc467d7ca0992a0329ab0.tar.xz openshift-9929c67a7011027b1e9fc467d7ca0992a0329ab0.zip | |
Merge pull request #5314 from fabianvf/asb-config-update
Automatic merge from submit-queue.
Update broker configuration to track current broker
Broker configuration has been drifting from this installer, updated configuration and deployment methods a bit to make it work with the new upstream broker.
Note: This will not work well when deploying openshift-enterprise, to deploy openshift-enterprise you will need to use an older checkout of openshift-ansible, or specify the upstream broker + catalog and use a registry other than the RHCC. This is because the configuration for the current upstream broker is incompatible with the downstream broker.
Diffstat (limited to 'roles/lib_openshift/src/doc/secret')
| -rw-r--r-- | roles/lib_openshift/src/doc/secret | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/lib_openshift/src/doc/secret b/roles/lib_openshift/src/doc/secret index 76b147f6f..a27f90f38 100644 --- a/roles/lib_openshift/src/doc/secret +++ b/roles/lib_openshift/src/doc/secret @@ -39,6 +39,12 @@ options: required: false default: default aliases: [] + annotations: + description: + - Annotations to apply to the object + required: false + default: None + aliases: [] files: description: - A list of files provided for secrets |