Merge pull request #9212 from bparees/readme

don't sync extraneous files(e.g. readme,owners)

roles/openshift_examples/examples-sync.sh

@@ -9,7 +9,7 @@ XPAAS_VERSION=ose-v1.4.14
 RHDM70_VERSION=7.0.1.GA
 RHPAM70_VERSION=7.0.0.GA
 DG_72_VERSION=datagrid72-dev
-ORIGIN_VERSION=${1:-v3.9}
+ORIGIN_VERSION=${1:-v3.11}
 ORIGIN_BRANCH=${2:-master}
 RHAMP_TAG=2.0.0.GA
 EXAMPLES_BASE=$(pwd)/files/examples/${ORIGIN_VERSION}
@@ -34,10 +34,10 @@ unzip rhpam-application-templates.zip
 unzip fis-GA.zip
 unzip amp.zip
 unzip dg-application-templates.zip
-mv origin-${ORIGIN_BRANCH}/examples/db-templates/* ${EXAMPLES_BASE}/db-templates/
-mv origin-${ORIGIN_BRANCH}/examples/quickstarts/* ${EXAMPLES_BASE}/quickstart-templates/
+mv origin-${ORIGIN_BRANCH}/examples/db-templates/*.{yaml,json} ${EXAMPLES_BASE}/db-templates/
+mv origin-${ORIGIN_BRANCH}/examples/quickstarts/*.{yaml,json} ${EXAMPLES_BASE}/quickstart-templates/
 mv origin-${ORIGIN_BRANCH}/examples/jenkins/jenkins-*template.json ${EXAMPLES_BASE}/quickstart-templates/
-mv origin-${ORIGIN_BRANCH}/examples/image-streams/* ${EXAMPLES_BASE}/image-streams/
+mv origin-${ORIGIN_BRANCH}/examples/image-streams/*.{yaml,json} ${EXAMPLES_BASE}/image-streams/
 mv application-templates-${XPAAS_VERSION}/jboss-image-streams.json ${EXAMPLES_BASE}/xpaas-streams/
 mv rhdm-7-openshift-image-${RHDM70_VERSION}/rhdm70-image-streams.yaml ${EXAMPLES_BASE}/xpaas-streams/
 mv rhpam-7-openshift-image-${RHPAM70_VERSION}/rhpam70-image-streams.yaml ${EXAMPLES_BASE}/xpaas-streams/
@@ -45,7 +45,7 @@ mv jboss-datagrid-7-openshift-image-${DG_72_VERSION}/templates/datagrid72-image-
 # fis content from jboss-fuse/application-templates-GA would collide with jboss-openshift/application-templates
 # as soon as they use the same branch/tag names
 mv application-templates-GA/fis-image-streams.json ${EXAMPLES_BASE}/xpaas-streams/fis-image-streams.json
-mv application-templates-GA/quickstarts/* ${EXAMPLES_BASE}/xpaas-templates/
+mv application-templates-GA/quickstarts/*.{yaml,json} ${EXAMPLES_BASE}/xpaas-templates/
 mv application-templates-GA/fis-console-namespace-template.json application-templates-GA/fis-console-cluster-template.json ${EXAMPLES_BASE}/xpaas-templates/
 find application-templates-${XPAAS_VERSION}/ -name '*.json' ! -wholename '*secret*' ! -wholename '*demo*' ! -wholename '*image-stream.json' -exec mv {} ${EXAMPLES_BASE}/xpaas-templates/ \;
 find application-templates-${XPAAS_VERSION}/ -name '*image-stream.json' -exec mv {} ${EXAMPLES_BASE}/xpaas-streams/ \;

roles/openshift_examples/files/examples/v3.11/db-templates/OWNERS

@@ -1,12 +0,0 @@
-reviewers:
-  - bparees
-  - gabemontero
-  - mfojtik
-  - dinhxuanvu
-  - jim-minter
-  - spadgett
-approvers:
-  - bparees
-  - mfojtik
-  - spadgett
-  - jupierce

roles/openshift_examples/files/examples/v3.11/db-templates/README.md

@@ -1,84 +0,0 @@
-OpenShift 3 Database Examples
-=============================
-
-This directory contains example JSON templates to deploy databases in OpenShift.
-They can be used to immediately instantiate a database and expose it as a
-service in the current project, or to add a template that can be later used from
-the Web Console or the CLI.
-
-The examples can also be tweaked to create new templates.
-
-
-## Ephemeral vs. Persistent
-
-For each supported database, there are two template files.
-
-Files named `*-ephemeral-template.json` use
-"[emptyDir](https://docs.openshift.org/latest/dev_guide/volumes.html)" volumes
-for data storage, which means that data is lost after a pod restart.
-This is tolerable for experimenting, but not suitable for production use.
-
-The other templates, named `*-persistent-template.json`, use [persistent volume
-claims](https://docs.openshift.org/latest/architecture/additional_concepts/storage.html#persistent-volume-claims)
-to request persistent storage provided by [persistent
-volumes](https://docs.openshift.org/latest/architecture/additional_concepts/storage.html#persistent-volumes),
-that must have been created upfront.
-
-
-## Usage
-
-### Instantiating a new database service
-
-Use these instructions if you want to quickly deploy a new database service in
-your current project. Instantiate a new database service with this command:
-
-    $ oc new-app /path/to/template.json
-
-Replace `/path/to/template.json` with an appropriate path, that can be either a
-local path or an URL. Example:
-
-    $ oc new-app https://raw.githubusercontent.com/openshift/origin/master/examples/db-templates/mongodb-ephemeral-template.json
-
-The parameters listed in the output above can be tweaked by specifying values in
-the command line with the `-p` option:
-
-    $ oc new-app examples/db-templates/mongodb-ephemeral-template.json -p DATABASE_SERVICE_NAME=mydb -p MONGODB_USER=default
-
-Note that the persistent template requires an existing persistent volume,
-otherwise the deployment won't ever succeed.
-
-
-### Adding a database as a template
-
-Use these instructions if, instead of instantiating a service right away, you
-want to load the template into an OpenShift project so that it can be used
-later. Create the template with this command:
-
-    $ oc create -f /path/to/template.json
-
-Replace `/path/to/template.json` with an appropriate path, that can be either a
-local path or an URL. Example:
-
-    $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/db-templates/mongodb-ephemeral-template.json
-    template "mongodb-ephemeral" created
-
-The new template is now available to use in the Web Console or with `oc
-new-app`.
-
-
-## Available database example templates
-
-* [MariaDB](https://raw.githubusercontent.com/openshift/library/master/official/mariadb/templates/mariadb-ephemeral.json) - For more information see the [product documentation](https://docs.openshift.org/latest/using_images/db_images/mariadb.html).
-* [MariaDB Persistent](https://raw.githubusercontent.com/openshift/library/master/official/mariadb/templates/mariadb-persistent.json) - For more information see the [product documentation](https://docs.openshift.org/latest/using_images/db_images/mariadb.html).
-* [MongoDB](https://raw.githubusercontent.com/openshift/library/master/official/mongodb/templates/mongodb-ephemeral.json) - For more information see the [product documentation](https://docs.openshift.org/latest/using_images/db_images/mongodb.html).
-* [MongoDB Persistent](https://raw.githubusercontent.com/openshift/library/master/official/mongodb/templates/mongodb-persistent.json) - For more information see the [product documentation](https://docs.openshift.org/latest/using_images/db_images/mongodb.html).
-* [MySQL](https://raw.githubusercontent.com/openshift/library/master/official/mysql/templates/mysql-ephemeral.json) - For more information see the [product documentation](https://docs.openshift.org/latest/using_images/db_images/mysql.html).
-* [MySQL Persistent](https://raw.githubusercontent.com/openshift/library/master/official/mysql/templates/mysql-persistent.json) - For more information see the [product documentation](https://docs.openshift.org/latest/using_images/db_images/mysql.html).
-* [PostgreSQL](https://raw.githubusercontent.com/openshift/library/master/official/postgresql/templates/postgresql-ephemeral.json) - For more information see the [product documentation](https://docs.openshift.org/latest/using_images/db_images/postgresql.html).
-* [PostgreSQL Persistent](https://raw.githubusercontent.com/openshift/library/master/official/postgresql/templates/postgresql-persistent.json) - For more information see the [product documentation](https://docs.openshift.org/latest/using_images/db_images/postgresql.html).
-* [Redis](https://raw.githubusercontent.com/openshift/library/master/official/redis/templates/redis-ephemeral.json) - For more information see the [image documentation](https://github.com/sclorg/redis-container/blob/master/README.md).
-* [Redis Persistent](https://raw.githubusercontent.com/openshift/library/master/official/redis/templates/redis-persistent.json) - For more information see the [image documentation](https://github.com/sclorg/redis-container/blob/master/README.md).
-
-Note: This file is processed by `hack/update-external-examples.sh`. New examples
-must follow the exact syntax of the existing entries. Files in this directory
-are automatically pulled down, do not modify/add files to this directory.

roles/openshift_examples/files/examples/v3.11/db-templates/mysql-ephemeral-template.json

@@ -267,7 +267,7 @@
             "value": "sampledb"
         },
         {
-            "description": "Version of MySQL image to be used (5.5, 5.6, 5.7, or latest).",
+            "description": "Version of MySQL image to be used (5.7, or latest).",
             "displayName": "Version of MySQL Image",
             "name": "MYSQL_VERSION",
             "required": true,

roles/openshift_examples/files/examples/v3.11/db-templates/mysql-persistent-template.json

@@ -272,7 +272,7 @@
             "value": "1Gi"
         },
         {
-            "description": "Version of MySQL image to be used (5.5, 5.6, 5.7, or latest).",
+            "description": "Version of MySQL image to be used (5.7, or latest).",
             "displayName": "Version of MySQL Image",
             "name": "MYSQL_VERSION",
             "required": true,

roles/openshift_examples/files/examples/v3.11/image-streams/OWNERS

@@ -1,14 +0,0 @@
-reviewers:
-  - bparees
-  - sspeiche
-  - mfojtik
-  - liggitt
-  - jcantrill
-  - hhorak
-  - csrwng
-approvers:
-  - bparees
-  - mfojtik
-  - liggitt
-  - jcantrill
-  - csrwng

roles/openshift_examples/files/examples/v3.11/image-streams/README.md

@@ -1,54 +0,0 @@
-Imagestreams
-===========
-
-Imagestreams provide an abstraction for images located in a registry.  By referencing an imagestream (or a tag within an imagestream) instead
-of referencing a image registry/repository:tag directly, your resources can be triggered when the underlying image changes, as well as control
-when image updates are rolled out.
-
-* [.NET Centos7](https://raw.githubusercontent.com/openshift/library/master/community/dotnet/imagestreams/dotnet-centos7.json)
-
-* [HTTPD Centos7](https://raw.githubusercontent.com/openshift/library/master/community/httpd/imagestreams/httpd-centos7.json)
-* [HTTPD RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/httpd/imagestreams/httpd-rhel7.json)
-
-* [Jenkins Centos7](https://raw.githubusercontent.com/openshift/library/master/community/jenkins/imagestreams/jenkins-centos7.json)
-* [Jenkins RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/jenkins/imagestreams/jenkins-rhel7.json)
-
-* [MariaDB Centos7](https://raw.githubusercontent.com/openshift/library/master/community/mariadb/imagestreams/mariadb-centos7.json)
-* [MariaDB RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/mariadb/imagestreams/mariadb-rhel7.json)
-
-* [MongoDB Centos7](https://raw.githubusercontent.com/openshift/library/master/community/mongodb/imagestreams/mongodb-centos7.json)
-* [MongoDB RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/mongodb/imagestreams/mongodb-rhel7.json)
-
-* [MySQL Centos7](https://raw.githubusercontent.com/openshift/library/master/community/mysql/imagestreams/mysql-centos7.json)
-* [MySQL RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/mysql/imagestreams/mysql-rhel7.json)
-
-* [Nginx Centos7](https://raw.githubusercontent.com/openshift/library/master/community/nginx/imagestreams/nginx-centos7.json)
-* [Nginx RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/nginx/imagestreams/nginx-rhel7.json)
-
-* [NodeJS Centos7](https://raw.githubusercontent.com/openshift/library/master/community/nodejs/imagestreams/nodejs-centos7.json)
-* [NodeJS RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/nodejs/imagestreams/nodejs-rhel7.json)
-
-* [Perl Centos7](https://raw.githubusercontent.com/openshift/library/master/community/perl/imagestreams/perl-centos7.json)
-* [Perl RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/perl/imagestreams/perl-rhel7.json)
-
-* [PHP Centos7](https://raw.githubusercontent.com/openshift/library/master/community/php/imagestreams/php-centos7.json)
-* [PHP RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/php/imagestreams/php-rhel7.json)
-
-* [Python Centos7](https://raw.githubusercontent.com/openshift/library/master/community/python/imagestreams/python-centos7.json)
-* [Python RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/python/imagestreams/python-rhel7.json)
-
-* [PostgreSQL Centos7](https://raw.githubusercontent.com/openshift/library/master/community/postgresql/imagestreams/postgresql-centos7.json)
-* [PostgreSQL RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/postgresql/imagestreams/postgresql-rhel7.json)
-
-* [Redis Centos7](https://raw.githubusercontent.com/openshift/library/master/community/redis/imagestreams/redis-centos7.json)
-* [Redis RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/redis/imagestreams/redis-rhel7.json)
-
-* [Ruby Centos7](https://raw.githubusercontent.com/openshift/library/master/community/ruby/imagestreams/ruby-centos7.json)
-* [Ruby RHEL7](https://raw.githubusercontent.com/openshift/library/master/official/ruby/imagestreams/ruby-rhel7.json)
-
-* [Wildfly Centos7](https://raw.githubusercontent.com/openshift/library/master/community/wildfly/imagestreams/wildfly-centos7.json)
-
-
-Note: This file is processed by `hack/update-external-examples.sh`. New examples
-must follow the exact syntax of the existing entries. Files in this directory
-are automatically pulled down, do not modify/add files to this directory.

roles/openshift_examples/files/examples/v3.11/quickstart-templates/OWNERS

@@ -1,12 +0,0 @@
-reviewers:
-  - bparees
-  - gabemontero
-  - coreydaley
-  - dinhxuanvu
-  - sspeiche
-  - mfojtik
-  - jupierce
-approvers:
-  - bparees
-  - mfojtik
-  - jupierce

roles/openshift_examples/files/examples/v3.11/quickstart-templates/README.md

@@ -1,38 +0,0 @@
-QuickStarts
-===========
-
-QuickStarts provide the basic skeleton of an application. Generally they
-reference a repository containing very simple source code that implements a
-trivial application using a particular framework. In addition they define any
-components needed for the application including a Build configuration,
-supporting services such as Databases, etc.
-
-You can instantiate these templates as is, or fork the source repository they
-reference and supply your forked repository as the source-repository when
-instantiating them.
-
-* [CakePHP](https://raw.githubusercontent.com/openshift/library/master/official/cakephp/templates/cakephp-mysql-example.json) - Provides a basic CakePHP application with a MySQL database. For more information see the [source repository](https://github.com/openshift/cakephp-ex).
-* [CakePHP persistent](https://raw.githubusercontent.com/openshift/library/master/official/cakephp/templates/cakephp-mysql-persistent.json) - Provides a basic CakePHP application with a persistent MySQL database. Note: requires available persistent volumes.  For more information see the [source repository](https://github.com/openshift/cakephp-ex).
-
-* [Dancer](https://raw.githubusercontent.com/openshift/library/master/official/dancer/templates/dancer-mysql-example.json) - Provides a basic Dancer (Perl) application with a MySQL database. For more information see the [source repository](https://github.com/openshift/dancer-ex).
-* [Dancer persistent](https://raw.githubusercontent.com/openshift/library/master/official/dancer/templates/dancer-mysql-persistent.json) - Provides a basic Dancer (Perl) application with a persistent MySQL database. Note: requires available persistent volumes.  For more information see the [source repository](https://github.com/openshift/dancer-ex).
-
-* [Django](https://raw.githubusercontent.com/openshift/library/master/official/django/templates/django-psql-example.json) - Provides a basic Django (Python) application with a PostgreSQL database. For more information see the [source repository](https://github.com/openshift/django-ex).
-* [Django persistent](https://raw.githubusercontent.com/openshift/library/master/official/django/templates/django-psql-persistent.json) - Provides a basic Django (Python) application with a persistent PostgreSQL database. Note: requires available persistent volumes.  For more information see the [source repository](https://github.com/openshift/django-ex).
-
-* [.NET Core](https://raw.githubusercontent.com/openshift/library/master/official/dotnet/templates/dotnet-example.json) - Provides a basic .NET Core application. For more information see the [source repository](https://github.com/redhat-developer/s2i-dotnetcore).
-* [[.NET Core persistent](https://raw.githubusercontent.com/openshift/library/master/official/dotnet/templates/dotnet-pgsql-persistent.json) - Provides a basic .NET Core application with a persistent PostgreSQL database. Note: requires available persistent volumes.  For more information see the [source repository](https://github.com/redhat-developer/s2i-dotnetcore).
-
-* [Httpd](https://raw.githubusercontent.com/openshift/library/master/official/httpd/templates/httpd-example.json) - Provides a basic Httpd static content application. For more information see the [source repository](https://github.com/openshift/httpd-ex).
-
-* [Nginx](https://raw.githubusercontent.com/openshift/library/master/official/nginx/templates/nginx-example.json) - Provides a basic Nginx static content application. For more information see the [source repository](https://github.com/sclorg/nginx-ex).
-
-* [NodeJS](https://raw.githubusercontent.com/openshift/library/master/official/nodejs/templates/nodejs-mongodb-example.json) - Provides a basic NodeJS application with a MongoDB database. For more information see the [source repository](https://github.com/openshift/nodejs-ex).
-* [NodeJS persistent](https://raw.githubusercontent.com/openshift/library/master/official/nodejs/templates/nodejs-mongo-persistent.json) - Provides a basic NodeJS application with a persistent MongoDB database. Note: requires available persistent volumes.  For more information see the [source repository](https://github.com/openshift/nodejs-ex).
-
-* [Rails](https://raw.githubusercontent.com/openshift/library/master/official/rails/templates/rails-postgresql-example.json) - Provides a basic Rails (Ruby) application with a PostgreSQL database. For more information see the [source repository](https://github.com/openshift/rails-ex).
-* [Rails persistent](https://raw.githubusercontent.com/openshift/library/master/official/rails/templates/rails-pgsql-persistent.json) - Provides a basic Rails (Ruby) application with a persistent PostgreSQL database. Note: requires available persistent volumes.  For more information see the [source repository](https://github.com/openshift/rails-ex).
-
-Note: This file is processed by `hack/update-external-examples.sh`. New examples
-must follow the exact syntax of the existing entries. Files in this directory
-are automatically pulled down, do not modify/add files to this directory.

roles/openshift_examples/files/examples/v3.11/quickstart-templates/cakephp-mysql-persistent.json

@@ -29,7 +29,6 @@
             },
             "stringData": {
                 "cakephp-secret-token": "${CAKEPHP_SECRET_TOKEN}",
-                "cakephp-security-cipher-seed": "${CAKEPHP_SECURITY_CIPHER_SEED}",
                 "cakephp-security-salt": "${CAKEPHP_SECURITY_SALT}",
                 "database-password": "${DATABASE_PASSWORD}",
                 "database-user": "${DATABASE_USER}"
@@ -100,7 +99,7 @@
                     }
                 },
                 "postCommit": {
-                    "script": "./lib/Cake/Console/cake test app AllTests"
+                    "script": "./vendor/bin/phpunit"
                 },
                 "source": {
                     "contextDir": "${CONTEXT_DIR}",
@@ -120,7 +119,7 @@
                         ],
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "php:7.0",
+                            "name": "php:${PHP_VERSION}",
                             "namespace": "${NAMESPACE}"
                         }
                     },
@@ -231,15 +230,6 @@
                                         }
                                     },
                                     {
-                                        "name": "CAKEPHP_SECURITY_CIPHER_SEED",
-                                        "valueFrom": {
-                                            "secretKeyRef": {
-                                                "key": "cakephp-security-cipher-seed",
-                                                "name": "${NAME}"
-                                            }
-                                        }
-                                    },
-                                    {
                                         "name": "OPCACHE_REVALIDATE_FREQ",
                                         "value": "${OPCACHE_REVALIDATE_FREQ}"
                                     }
@@ -476,6 +466,13 @@
             "value": "openshift"
         },
         {
+            "description": "Version of PHP image to be used (5.6, 7.0, 7.1 or latest).",
+            "displayName": "PHP Version",
+            "name": "PHP_VERSION",
+            "required": true,
+            "value": "7.1"
+        },
+        {
             "description": "Maximum amount of memory the CakePHP container can use.",
             "displayName": "Memory Limit",
             "name": "MEMORY_LIMIT",
@@ -572,13 +569,6 @@
             "name": "CAKEPHP_SECURITY_SALT"
         },
         {
-            "description": "Security cipher seed for session hash.",
-            "displayName": "CakePHP Security Cipher Seed",
-            "from": "[0-9]{30}",
-            "generate": "expression",
-            "name": "CAKEPHP_SECURITY_CIPHER_SEED"
-        },
-        {
             "description": "How often to check script timestamps for updates, in seconds. 0 will result in OPcache checking for updates on every request.",
             "displayName": "OPcache Revalidation Frequency",
             "name": "OPCACHE_REVALIDATE_FREQ",

roles/openshift_examples/files/examples/v3.11/quickstart-templates/cakephp-mysql.json

@@ -29,7 +29,6 @@
             },
             "stringData": {
                 "cakephp-secret-token": "${CAKEPHP_SECRET_TOKEN}",
-                "cakephp-security-cipher-seed": "${CAKEPHP_SECURITY_CIPHER_SEED}",
                 "cakephp-security-salt": "${CAKEPHP_SECURITY_SALT}",
                 "database-password": "${DATABASE_PASSWORD}",
                 "database-user": "${DATABASE_USER}"
@@ -100,7 +99,7 @@
                     }
                 },
                 "postCommit": {
-                    "script": "./lib/Cake/Console/cake test app AllTests"
+                    "script": "./vendor/bin/phpunit"
                 },
                 "source": {
                     "contextDir": "${CONTEXT_DIR}",
@@ -120,7 +119,7 @@
                         ],
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "php:7.0",
+                            "name": "php:${PHP_VERSION}",
                             "namespace": "${NAMESPACE}"
                         }
                     },
@@ -231,15 +230,6 @@
                                         }
                                     },
                                     {
-                                        "name": "CAKEPHP_SECURITY_CIPHER_SEED",
-                                        "valueFrom": {
-                                            "secretKeyRef": {
-                                                "key": "cakephp-security-cipher-seed",
-                                                "name": "${NAME}"
-                                            }
-                                        }
-                                    },
-                                    {
                                         "name": "OPCACHE_REVALIDATE_FREQ",
                                         "value": "${OPCACHE_REVALIDATE_FREQ}"
                                     }
@@ -457,6 +447,13 @@
             "value": "openshift"
         },
         {
+            "description": "Version of PHP image to be used (5.6, 7.0, 7.1 or latest).",
+            "displayName": "PHP Version",
+            "name": "PHP_VERSION",
+            "required": true,
+            "value": "7.1"
+        },
+        {
             "description": "Maximum amount of memory the CakePHP container can use.",
             "displayName": "Memory Limit",
             "name": "MEMORY_LIMIT",
@@ -546,13 +543,6 @@
             "name": "CAKEPHP_SECURITY_SALT"
         },
         {
-            "description": "Security cipher seed for session hash.",
-            "displayName": "CakePHP Security Cipher Seed",
-            "from": "[0-9]{30}",
-            "generate": "expression",
-            "name": "CAKEPHP_SECURITY_CIPHER_SEED"
-        },
-        {
             "description": "How often to check script timestamps for updates, in seconds. 0 will result in OPcache checking for updates on every request.",
             "displayName": "OPcache Revalidation Frequency",
             "name": "OPCACHE_REVALIDATE_FREQ",

roles/openshift_examples/files/examples/v3.11/quickstart-templates/django-postgresql-persistent.json

@@ -118,7 +118,7 @@
                         ],
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "python:3.5",
+                            "name": "python:${PYTHON_VERSION}",
                             "namespace": "${NAMESPACE}"
                         }
                     },
@@ -414,7 +414,7 @@
                             ],
                             "from": {
                                 "kind": "ImageStreamTag",
-                                "name": "postgresql:9.5",
+                                "name": "postgresql:${POSTGRESQL_VERSION}",
                                 "namespace": "${NAMESPACE}"
                             }
                         },
@@ -443,6 +443,20 @@
             "value": "openshift"
         },
         {
+            "description": "Version of Python image to be used (3.4, 3.5, 3.6 or latest).",
+            "displayName": "Version of Python Image",
+            "name": "PYTHON_VERSION",
+            "required": true,
+            "value": "3.6"
+        },
+        {
+            "description": "Version of PostgreSQL image to be used (9.4, 9.5, 9.6 or latest).",
+            "displayName": "Version of PostgreSQL Image",
+            "name": "POSTGRESQL_VERSION",
+            "required": true,
+            "value": "9.6"
+        },
+        {
             "description": "Maximum amount of memory the Django container can use.",
             "displayName": "Memory Limit",
             "name": "MEMORY_LIMIT",

roles/openshift_examples/files/examples/v3.11/quickstart-templates/django-postgresql.json

@@ -118,7 +118,7 @@
                         ],
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "python:3.5",
+                            "name": "python:${PYTHON_VERSION}",
                             "namespace": "${NAMESPACE}"
                         }
                     },
@@ -395,7 +395,7 @@
                             ],
                             "from": {
                                 "kind": "ImageStreamTag",
-                                "name": "postgresql:9.5",
+                                "name": "postgresql:${POSTGRESQL_VERSION}",
                                 "namespace": "${NAMESPACE}"
                             }
                         },
@@ -424,6 +424,20 @@
             "value": "openshift"
         },
         {
+            "description": "Version of Python image to be used (3.4, 3.5, 3.6 or latest).",
+            "displayName": "Version of Python Image",
+            "name": "PYTHON_VERSION",
+            "required": true,
+            "value": "3.6"
+        },
+        {
+            "description": "Version of PostgreSQL image to be used (9.4, 9.5, 9.6 or latest).",
+            "displayName": "Version of PostgreSQL Image",
+            "name": "POSTGRESQL_VERSION",
+            "required": true,
+            "value": "9.6"
+        },
+        {
             "description": "Maximum amount of memory the Django container can use.",
             "displayName": "Memory Limit",
             "name": "MEMORY_LIMIT",

roles/openshift_examples/files/examples/v3.11/quickstart-templates/jenkins-persistent-template.json

@@ -113,6 +113,10 @@
                                     {
                                         "name": "JNLP_SERVICE_NAME",
                                         "value": "${JNLP_SERVICE_NAME}"
+                                    },
+                                    {
+                                        "name": "ENABLE_FATAL_ERROR_LOG_FILE",
+                                        "value": "${ENABLE_FATAL_ERROR_LOG_FILE}"
                                     }
                                 ],
                                 "image": " ",
@@ -316,6 +320,12 @@
             "displayName": "Jenkins ImageStreamTag",
             "name": "JENKINS_IMAGE_STREAM_TAG",
             "value": "jenkins:2"
+        },
+        {
+            "description": "When a fatal error occurs, an error log is created with information and the state obtained at the time of the fatal error.",
+            "displayName": "Fatal Error Log File",
+            "name": "ENABLE_FATAL_ERROR_LOG_FILE",
+            "value": "false"
         }
     ]
 }

roles/openshift_examples/files/examples/v3.11/quickstart-templates/nodejs-mongodb-persistent.json

@@ -117,7 +117,7 @@
                         ],
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "nodejs:6",
+                            "name": "nodejs:${NODEJS_VERSION}",
                             "namespace": "${NAMESPACE}"
                         }
                     },
@@ -213,7 +213,7 @@
                                 "image": " ",
                                 "livenessProbe": {
                                     "httpGet": {
-                                        "path": "/pagecount",
+                                        "path": "/",
                                         "port": 8080
                                     },
                                     "initialDelaySeconds": 30,
@@ -227,7 +227,7 @@
                                 ],
                                 "readinessProbe": {
                                     "httpGet": {
-                                        "path": "/pagecount",
+                                        "path": "/",
                                         "port": 8080
                                     },
                                     "initialDelaySeconds": 3,
@@ -420,7 +420,7 @@
                             ],
                             "from": {
                                 "kind": "ImageStreamTag",
-                                "name": "mongodb:3.2",
+                                "name": "mongodb:${MONGODB_VERSION}",
                                 "namespace": "${NAMESPACE}"
                             }
                         },
@@ -449,6 +449,20 @@
             "value": "openshift"
         },
         {
+            "description": "Version of NodeJS image to be used (6, 8, or latest).",
+            "displayName": "Version of NodeJS Image",
+            "name": "NODEJS_VERSION",
+            "required": true,
+            "value": "8"
+        },
+        {
+            "description": "Version of MongoDB image to be used (3.2, 3.4, or latest).",
+            "displayName": "Version of MongoDB Image",
+            "name": "MONGODB_VERSION",
+            "required": true,
+            "value": "3.4"
+        },
+        {
             "description": "Maximum amount of memory the Node.js container can use.",
             "displayName": "Memory Limit",
             "name": "MEMORY_LIMIT",

roles/openshift_examples/files/examples/v3.11/quickstart-templates/nodejs-mongodb.json

@@ -118,7 +118,7 @@
                         ],
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "nodejs:6",
+                            "name": "nodejs:${NODEJS_VERSION}",
                             "namespace": "${NAMESPACE}"
                         }
                     },
@@ -214,7 +214,7 @@
                                 "image": " ",
                                 "livenessProbe": {
                                     "httpGet": {
-                                        "path": "/pagecount",
+                                        "path": "/",
                                         "port": 8080
                                     },
                                     "initialDelaySeconds": 30,
@@ -228,7 +228,7 @@
                                 ],
                                 "readinessProbe": {
                                     "httpGet": {
-                                        "path": "/pagecount",
+                                        "path": "/",
                                         "port": 8080
                                     },
                                     "initialDelaySeconds": 3,
@@ -404,7 +404,7 @@
                             ],
                             "from": {
                                 "kind": "ImageStreamTag",
-                                "name": "mongodb:3.2",
+                                "name": "mongodb:${MONGODB_VERSION}",
                                 "namespace": "${NAMESPACE}"
                             }
                         },
@@ -433,6 +433,20 @@
             "value": "openshift"
         },
         {
+            "description": "Version of NodeJS image to be used (6, 8, or latest).",
+            "displayName": "Version of NodeJS Image",
+            "name": "NODEJS_VERSION",
+            "required": true,
+            "value": "8"
+        },
+        {
+            "description": "Version of MongoDB image to be used (3.2, 3.4, or latest).",
+            "displayName": "Version of MongoDB Image",
+            "name": "MONGODB_VERSION",
+            "required": true,
+            "value": "3.4"
+        },
+        {
             "description": "Maximum amount of memory the Node.js container can use.",
             "displayName": "Memory Limit",
             "name": "MEMORY_LIMIT",