Sync image stream data

roles/openshift_examples/examples-sync.sh

@@ -9,7 +9,7 @@ XPAAS_VERSION=ose-v1.3.3
 ORIGIN_VERSION=${1:-v1.3}
 EXAMPLES_BASE=$(pwd)/files/examples/${ORIGIN_VERSION}
 find ${EXAMPLES_BASE} -name '*.json' -delete
-find ${EXAMPLES_BASE} -name '*.yaml' -delete
+find ${EXAMPLES_BASE} -name '*.yaml' -delete -exclude registry-console.json
 TEMP=`mktemp -d`
 pushd $TEMP
 
@@ -29,7 +29,6 @@ unzip cakephp-ex-master.zip
 unzip application-templates-master.zip
 cp origin-master/examples/db-templates/* ${EXAMPLES_BASE}/db-templates/
 cp origin-master/examples/jenkins/jenkins-*template.json ${EXAMPLES_BASE}/quickstart-templates/
-cp origin-master/examples/jenkins/pipeline/jenkinstemplate.json ${EXAMPLES_BASE}/quickstart-templates/
 cp origin-master/examples/image-streams/* ${EXAMPLES_BASE}/image-streams/
 cp django-ex-master/openshift/templates/* ${EXAMPLES_BASE}/quickstart-templates/
 cp rails-ex-master/openshift/templates/* ${EXAMPLES_BASE}/quickstart-templates/

roles/openshift_examples/files/examples/v1.3/db-templates/README.md

@@ -38,35 +38,11 @@ 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
-    --> Deploying template mongodb-ephemeral for "https://raw.githubusercontent.com/openshift/origin/master/examples/db-templates/mongodb-ephemeral-template.json"
-     With parameters:
-      DATABASE_SERVICE_NAME=mongodb
-      MONGODB_USER=userJNX # generated
-      MONGODB_PASSWORD=tnEDilMVrgjp5AI2 # generated
-      MONGODB_DATABASE=sampledb
-      MONGODB_ADMIN_PASSWORD=8bYEs8OlNYhVyMBs # generated
-    --> Creating resources ...
-    Service "mongodb" created
-    DeploymentConfig "mongodb" created
-    --> Success
-    Run 'oc status' to view your app.
 
 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
-    --> Deploying template mongodb-ephemeral for "examples/db-templates/mongodb-ephemeral-template.json"
-         With parameters:
-          DATABASE_SERVICE_NAME=mydb
-          MONGODB_USER=default
-          MONGODB_PASSWORD=RPvMbWlQFOevSowQ # generated
-          MONGODB_DATABASE=sampledb
-          MONGODB_ADMIN_PASSWORD=K7tIjDxDHHYCvFrJ # generated
-    --> Creating resources ...
-        Service "mydb" created
-        DeploymentConfig "mydb" created
-    --> Success
-        Run 'oc status' to view your app.
 
 Note that the persistent template requires an existing persistent volume,
 otherwise the deployment won't ever succeed.

roles/openshift_examples/files/examples/v1.3/quickstart-templates/cakephp-mysql.json

@@ -126,9 +126,9 @@
       },
       "spec": {
         "strategy": {
-          "type": "Rolling",
+          "type": "Recreate",
           "recreateParams": {
-          "pre": {
+            "pre": {
               "failurePolicy": "Retry",
               "execNewPod": {
                 "command": [