diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-06-30 16:51:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-30 16:51:00 -0400 |
commit | 31005495f571e02c671b90d2b4c0bb2d57fe4457 (patch) | |
tree | 4de7d3bf4363a2a88afc0e870baa5ad0b630c4da /roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql-persistent.json | |
parent | a5e1e1fb2b068251c050722fd5f742dd3a92d93c (diff) | |
parent | 94feef04f73d970bb6ec45afa3629e368e6c7df6 (diff) | |
download | openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.tar.gz openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.tar.bz2 openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.tar.xz openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.zip |
Merge pull request #4659 from sdodson/image-stream-sync
Sync all content
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql-persistent.json')
-rw-r--r-- | roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql-persistent.json | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql-persistent.json b/roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql-persistent.json index b400cfdb3..f07a43071 100644 --- a/roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql-persistent.json +++ b/roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql-persistent.json @@ -23,7 +23,11 @@ "kind": "Secret", "apiVersion": "v1", "metadata": { - "name": "${NAME}" + "name": "${NAME}", + "annotations": { + "template.openshift.io/expose-username": "{.data['application-user']}", + "template.openshift.io/expose-password": "{.data['application-password']}" + } }, "stringData" : { "database-user" : "${DATABASE_USER}", @@ -60,7 +64,10 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}" + "name": "${NAME}", + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + } }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -526,7 +533,7 @@ { "name": "GITHUB_WEBHOOK_SECRET", "displayName": "GitHub Webhook Secret", - "description": "A secret string used to configure the GitHub webhook.", + "description": "Github trigger secret. A difficult to guess string encoded as part of the webhook URL. Not encrypted.", "generate": "expression", "from": "[a-zA-Z0-9]{40}" }, |