Update sync db-templates, image-streams, and quickstart-templates

11 files changed, 142 insertions, 50 deletions

diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp-mysql.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp-mysql.json
index da5679444..52143da2d 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp-mysql.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp-mysql.json
@@ -83,7 +83,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "openshift",
-              "name": "php:5.5"
+              "name": "php:5.6"
             }
           }
         },
@@ -98,6 +98,9 @@
             "type": "ImageChange"
           },
           {
+            "type": "ConfigChange"
+          },
+          {
             "type": "GitHub",
             "github": {
               "secret": "${GITHUB_WEBHOOK_SECRET}"
@@ -250,6 +253,20 @@
         },
         "triggers": [
           {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": false,
+              "containerNames": [
+                "mysql"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "namespace": "openshift",
+                "name": "mysql:5.6"
+              }
+            }
+          },
+          {
             "type": "ConfigChange"
           }
         ],
@@ -268,7 +285,7 @@
             "containers": [
               {
                 "name": "mysql",
-                "image": "${MYSQL_IMAGE}",
+                "image": "mysql",
                 "ports": [
                   {
                     "containerPort": 3306
@@ -347,11 +364,6 @@
       "from": "[a-zA-Z0-9]{16}"
     },
     {
-      "name": "MYSQL_IMAGE",
-      "description": "Image to use for mysql",
-      "value": "openshift/mysql-55-centos7"      
-    },
-    {
       "name": "CAKEPHP_SECRET_TOKEN",
       "description": "Set this to a long random string",
       "generate": "expression",
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp.json
index f426e1dd6..b77dc0c51 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp.json
@@ -83,7 +83,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "openshift",
-              "name": "php:5.5"
+              "name": "php:5.6"
             }
           }
         },
@@ -98,6 +98,9 @@
             "type": "ImageChange"
           },
           {
+            "type": "ConfigChange"
+          },
+          {
             "type": "GitHub",
             "github": {
               "secret": "${GITHUB_WEBHOOK_SECRET}"
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/dancer-mysql.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/dancer-mysql.json
index 55f655102..edc6a1f3f 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/dancer-mysql.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/dancer-mysql.json
@@ -83,7 +83,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "openshift",
-              "name": "perl:5.16"
+              "name": "perl:5.20"
             }
           }
         },
@@ -98,6 +98,9 @@
             "type": "ImageChange"
           },
           {
+            "type": "ConfigChange"
+          },
+          {
             "type": "GitHub",
             "github": {
               "secret": "${GITHUB_WEBHOOK_SECRET}"
@@ -224,6 +227,20 @@
         },
         "triggers": [
           {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": false,
+              "containerNames": [
+                "mysql"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "namespace": "openshift",
+                "name": "mysql:5.6"
+              }
+            }
+          },
+          {
             "type": "ConfigChange"
           }
         ],
@@ -242,7 +259,7 @@
             "containers": [
               {
                 "name": "mysql",
-                "image": "${MYSQL_IMAGE}",
+                "image": "mysql",
                 "ports": [
                   {
                     "containerPort": 3306
@@ -329,11 +346,6 @@
       "value": "sampledb"
     },
     {
-      "name": "MYSQL_IMAGE",
-      "description": "Image to use for mysql",
-      "value": "openshift/mysql-55-centos7"      
-    },
-    {
       "name": "PERL_APACHE2_RELOAD",
       "description": "Set this to \"true\" to enable automatic reloading of modified Perl modules",
       "value": ""
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/dancer.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/dancer.json
index 3ee19be83..409252d82 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/dancer.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/dancer.json
@@ -83,7 +83,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "openshift",
-              "name": "perl:5.16"
+              "name": "perl:5.20"
             }
           }
         },
@@ -98,6 +98,9 @@
             "type": "ImageChange"
           },
           {
+            "type": "ConfigChange"
+          },
+          {
             "type": "GitHub",
             "github": {
               "secret": "${GITHUB_WEBHOOK_SECRET}"
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/django-postgresql.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/django-postgresql.json
index 749064e98..c4c55ddd8 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/django-postgresql.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/django-postgresql.json
@@ -83,7 +83,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "openshift",
-              "name": "python:3.3"
+              "name": "python:3.4"
             }
           }
         },
@@ -98,6 +98,9 @@
             "type": "ImageChange"
           },
           {
+            "type": "ConfigChange"
+          },
+          {
             "type": "GitHub",
             "github": {
               "secret": "${GITHUB_WEBHOOK_SECRET}"
@@ -231,6 +234,20 @@
         },
         "triggers": [
           {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": false,
+              "containerNames": [
+                "postgresql"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "namespace": "openshift",
+                "name": "postgresql:9.4"
+              }
+            }
+          },
+          {
             "type": "ConfigChange"
           }
         ],
@@ -249,7 +266,7 @@
             "containers": [
               {
                 "name": "postgresql",
-                "image": "${POSTGRESQL_IMAGE}",
+                "image": "postgresql",
                 "ports": [
                   {
                     "containerPort": 5432
@@ -328,11 +345,6 @@
       "from": "[a-zA-Z0-9]{16}"
     },
     {
-      "name": "POSTGRESQL_IMAGE",
-      "description": "Image to use for postgresql",
-      "value": "openshift/postgresql-92-centos7"      
-    },
-    {
       "name": "APP_CONFIG",
       "description": "Relative path to Gunicorn configuration file (optional)"
     },
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/django.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/django.json
index 143a942ab..75b6798b5 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/django.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/django.json
@@ -83,7 +83,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "openshift",
-              "name": "python:3.3"
+              "name": "python:3.4"
             }
           }
         },
@@ -98,6 +98,9 @@
             "type": "ImageChange"
           },
           {
+            "type": "ConfigChange"
+          },
+          {
             "type": "GitHub",
             "github": {
               "secret": "${GITHUB_WEBHOOK_SECRET}"
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
index 14bd032af..0b016373f 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
@@ -7,7 +7,7 @@
     "annotations": {
       "description": "Jenkins service, without persistent storage. WARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
       "iconClass": "icon-jenkins",
-      "tags": "database,jenkins"
+      "tags": "instant-app,jenkins"
     }
   },
   "objects": [
@@ -70,6 +70,21 @@
         },
         "triggers": [
           {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": false,
+              "containerNames": [
+                "jenkins"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "name": "jenkins:latest",
+                "namespace": "openshift"
+              },
+              "lastTriggeredImage": ""
+            }
+          },
+          {
             "type": "ConfigChange"
           }
         ],
@@ -133,11 +148,6 @@
       "value": "jenkins"
     },
     {
-      "name": "JENKINS_IMAGE",
-      "description": "Jenkins Docker image to use",
-      "value": "openshift/jenkins-1-centos7"
-    },
-    {
       "name": "JENKINS_PASSWORD",
       "description": "Password for the Jenkins user",
       "generate": "expression",
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-persistent-template.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-persistent-template.json
index fa31de486..98f0cea95 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-persistent-template.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-persistent-template.json
@@ -7,7 +7,7 @@
     "annotations": {
       "description": "Jenkins service, with persistent storage.",
       "iconClass": "icon-jenkins",
-      "tags": "database,jenkins"
+      "tags": "instant-app,jenkins"
     }
   },
   "objects": [
@@ -87,6 +87,21 @@
         },
         "triggers": [
           {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": true,
+              "containerNames": [
+                "jenkins"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "name": "jenkins:latest",
+                "namespace": "openshift"
+              },
+              "lastTriggeredImage": ""
+            }
+          },
+          {
             "type": "ConfigChange"
           }
         ],
@@ -156,11 +171,6 @@
       "value": "password"
     },
     {
-      "name": "JENKINS_IMAGE",
-      "description": "Jenkins Docker image to use",
-      "value": "openshift/jenkins-1-centos7"
-    },
-    {
       "name": "VOLUME_CAPACITY",
       "description": "Volume space available for data, e.g. 512Mi, 2Gi",
       "value": "512Mi",
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/nodejs-mongodb.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/nodejs-mongodb.json
index 8760b074c..21f943da7 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/nodejs-mongodb.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/nodejs-mongodb.json
@@ -98,6 +98,9 @@
             "type": "ImageChange"
           },
           {
+            "type": "ConfigChange"
+          },
+          {
             "type": "GitHub",
             "github": {
               "secret": "${GITHUB_WEBHOOK_SECRET}"
@@ -229,6 +232,20 @@
         },
         "triggers": [
           {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": false,
+              "containerNames": [
+                "mongodb"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "namespace": "openshift",
+                "name": "mongodb:2.6"
+              }
+            }
+          },
+          {
             "type": "ConfigChange"
           }
         ],
@@ -247,7 +264,7 @@
             "containers": [
               {
                 "name": "mongodb",
-                "image": "${MONGODB_IMAGE}",
+                "image": "mongodb",
                 "ports": [
                   {
                     "containerPort": 27017
@@ -336,11 +353,6 @@
       "description": "Password for the database admin user",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}"
-    },
-    {
-      "name": "MONGODB_IMAGE",
-      "description": "Image to use for mongodb",
-      "value": "openshift/mongodb-24-centos7"
     }
   ]
 }
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/nodejs.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/nodejs.json
index e047266e3..1e301c076 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/nodejs.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/nodejs.json
@@ -98,6 +98,9 @@
             "type": "ImageChange"
           },
           {
+            "type": "ConfigChange"
+          },
+          {
             "type": "GitHub",
             "github": {
               "secret": "${GITHUB_WEBHOOK_SECRET}"
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/rails-postgresql.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/rails-postgresql.json
index b98282528..5dcbbc729 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/rails-postgresql.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/rails-postgresql.json
@@ -83,7 +83,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "openshift",
-              "name": "ruby:2.0"
+              "name": "ruby:2.2"
             }
           }
         },
@@ -98,6 +98,9 @@
             "type": "ImageChange"
           },
           {
+            "type": "ConfigChange"
+          },
+          {
             "type": "GitHub",
             "github": {
               "secret": "${GITHUB_WEBHOOK_SECRET}"
@@ -262,6 +265,20 @@
         },
         "triggers": [
           {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": false,
+              "containerNames": [
+                "postgresql"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "namespace": "openshift",
+                "name": "postgresql:9.4"
+              }
+            }
+          },
+          {
             "type": "ConfigChange"
           }
         ],
@@ -280,7 +297,7 @@
             "containers": [
               {
                 "name": "postgresql",
-                "image": "${POSTGRESQL_IMAGE}",
+                "image": "postgresql",
                 "ports": [
                   {
                     "containerPort": 5432
@@ -384,14 +401,9 @@
       "value": "root"
     },
     {
-      "name": "POSTGRESQL_IMAGE",
-      "description": "Image to use for postgresql",
-      "value": "openshift/postgresql-92-centos7"      
-    },
-    {
       "name": "POSTGRESQL_MAX_CONNECTIONS",
       "description": "database max connections",
-      "value": "10"
+      "value": "100"
     },
     {
       "name": "POSTGRESQL_SHARED_BUFFERS",