diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-11-08 13:18:41 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-08 13:18:41 -0500 |
commit | a4d4b530bd4390a4a7f4cc277d02fd52796ee144 (patch) | |
tree | f3164f9177d741691b0fb49271cc4639481be51a /roles/openshift_examples/files/examples/v3.7/xpaas-templates/jws31-tomcat7-mongodb-s2i.json | |
parent | 315decc0bf8ddabcf4303e3ba069944b1d40f5a5 (diff) | |
parent | 93932af0d61379d3e02a26e49d24a37e0c64da15 (diff) | |
download | openshift-a4d4b530bd4390a4a7f4cc277d02fd52796ee144.tar.gz openshift-a4d4b530bd4390a4a7f4cc277d02fd52796ee144.tar.bz2 openshift-a4d4b530bd4390a4a7f4cc277d02fd52796ee144.tar.xz openshift-a4d4b530bd4390a4a7f4cc277d02fd52796ee144.zip |
Merge pull request #5966 from sdodson/iss-master
Update to xpaas v1.4.6 content
Diffstat (limited to 'roles/openshift_examples/files/examples/v3.7/xpaas-templates/jws31-tomcat7-mongodb-s2i.json')
-rw-r--r-- | roles/openshift_examples/files/examples/v3.7/xpaas-templates/jws31-tomcat7-mongodb-s2i.json | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/roles/openshift_examples/files/examples/v3.7/xpaas-templates/jws31-tomcat7-mongodb-s2i.json b/roles/openshift_examples/files/examples/v3.7/xpaas-templates/jws31-tomcat7-mongodb-s2i.json index a565ee4c0..fc473f5c3 100644 --- a/roles/openshift_examples/files/examples/v3.7/xpaas-templates/jws31-tomcat7-mongodb-s2i.json +++ b/roles/openshift_examples/files/examples/v3.7/xpaas-templates/jws31-tomcat7-mongodb-s2i.json @@ -3,19 +3,20 @@ "apiVersion": "v1", "metadata": { "annotations": { - "iconClass": "icon-tomcat", + "iconClass": "icon-rh-tomcat", + "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "Application template for JWS MongoDB applications built using S2I.", - "tags": "tomcat,tomcat7,java,jboss,xpaas", - "version": "1.4.0", - "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Tomcat 7 + MongoDB (Ephemeral with https)" + "tags": "tomcat,tomcat7,java,jboss,hidden", + "version": "1.4.7", + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + MongoDB (Ephemeral with https)" }, "name": "jws31-tomcat7-mongodb-s2i" }, "labels": { "template": "jws31-tomcat7-mongodb-s2i", - "xpaas": "1.4.0" + "xpaas": "1.4.7" }, - "message": "A new JWS application for Tomcat 7 (using MongoDB) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MongoDB database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\"). Please be sure to create the \"jws-service-account\" service account and the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 7 (using MongoDB) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MongoDB database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\"). Please be sure to create the \"jws-service-account\" service account and the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", "parameters": [ { "displayName": "Application Name", @@ -384,7 +385,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "jboss-webserver31-tomcat7-openshift:1.0" + "name": "jboss-webserver31-tomcat7-openshift:1.1" } } }, |