diff options
42 files changed, 362 insertions, 331 deletions
diff --git a/roles/openshift_examples/files/examples/db-templates/mongodb-persistent-template.json b/roles/openshift_examples/files/examples/db-templates/mongodb-persistent-template.json index ff19a4834..c05e81e56 100644 --- a/roles/openshift_examples/files/examples/db-templates/mongodb-persistent-template.json +++ b/roles/openshift_examples/files/examples/db-templates/mongodb-persistent-template.json @@ -47,7 +47,7 @@ }, "spec": { "accessModes": [ - "ReadWriteMany" + "ReadWriteOnce" ], "resources": { "requests": { @@ -148,7 +148,7 @@ { "name": "${DATABASE_SERVICE_NAME}-data", "persistentVolumeClaim": { - "claimName": "mongodb" + "claimName": "${DATABASE_SERVICE_NAME}" } } ], diff --git a/roles/openshift_examples/files/examples/db-templates/mysql-persistent-template.json b/roles/openshift_examples/files/examples/db-templates/mysql-persistent-template.json index 90225e9c3..33e1cebb1 100644 --- a/roles/openshift_examples/files/examples/db-templates/mysql-persistent-template.json +++ b/roles/openshift_examples/files/examples/db-templates/mysql-persistent-template.json @@ -47,7 +47,7 @@ }, "spec": { "accessModes": [ - "ReadWriteMany" + "ReadWriteOnce" ], "resources": { "requests": { @@ -144,7 +144,7 @@ { "name": "${DATABASE_SERVICE_NAME}-data", "persistentVolumeClaim": { - "claimName": "mysql" + "claimName": "${DATABASE_SERVICE_NAME}" } } ], diff --git a/roles/openshift_examples/files/examples/db-templates/postgresql-ephemeral-template.json b/roles/openshift_examples/files/examples/db-templates/postgresql-ephemeral-template.json index 6922baa12..faf626475 100644 --- a/roles/openshift_examples/files/examples/db-templates/postgresql-ephemeral-template.json +++ b/roles/openshift_examples/files/examples/db-templates/postgresql-ephemeral-template.json @@ -143,7 +143,7 @@ { "name": "DATABASE_SERVICE_NAME", "description": "Database service name", - "value": "mysql" + "value": "postgresql" }, { "name": "POSTGRESQL_USER", diff --git a/roles/openshift_examples/files/examples/db-templates/postgresql-persistent-template.json b/roles/openshift_examples/files/examples/db-templates/postgresql-persistent-template.json index 43162d8bb..398e288bf 100644 --- a/roles/openshift_examples/files/examples/db-templates/postgresql-persistent-template.json +++ b/roles/openshift_examples/files/examples/db-templates/postgresql-persistent-template.json @@ -47,7 +47,7 @@ }, "spec": { "accessModes": [ - "ReadWriteMany" + "ReadWriteOnce" ], "resources": { "requests": { @@ -144,7 +144,7 @@ { "name": "${DATABASE_SERVICE_NAME}-data", "persistentVolumeClaim": { - "claimName": "postgresql" + "claimName": "${DATABASE_SERVICE_NAME}" } } ], @@ -160,7 +160,7 @@ { "name": "DATABASE_SERVICE_NAME", "description": "Database service name", - "value": "mysql" + "value": "postgresql" }, { "name": "POSTGRESQL_USER", diff --git a/roles/openshift_examples/files/examples/image-streams/image-streams-centos7.json b/roles/openshift_examples/files/examples/image-streams/image-streams-centos7.json index 712a43a11..459b841c1 100644 --- a/roles/openshift_examples/files/examples/image-streams/image-streams-centos7.json +++ b/roles/openshift_examples/files/examples/image-streams/image-streams-centos7.json @@ -251,6 +251,29 @@ } ] } + }, + { + "kind": "ImageStream", + "apiVersion": "v1beta3", + "metadata": { + "name": "jenkins", + "creationTimestamp": null + }, + "spec": { + "dockerImageRepository": "openshift/jenkins-16-centos7", + "tags": [ + { + "name": "latest" + }, + { + "name": "1.6", + "from": { + "Kind": "ImageStreamTag", + "Name": "latest" + } + } + ] + } } ] } diff --git a/roles/openshift_examples/files/examples/quickstart-templates/cakephp-mysql.json b/roles/openshift_examples/files/examples/quickstart-templates/cakephp-mysql.json index e5699bce7..b722a05ae 100644 --- a/roles/openshift_examples/files/examples/quickstart-templates/cakephp-mysql.json +++ b/roles/openshift_examples/files/examples/quickstart-templates/cakephp-mysql.json @@ -17,7 +17,7 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "cakephp-frontend", + "name": "cakephp-mysql-example", "annotations": { "description": "Exposes and load balances the application pods" } @@ -31,7 +31,7 @@ } ], "selector": { - "name": "cakephp-frontend" + "name": "cakephp-mysql-example" } } }, @@ -39,13 +39,13 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "cakephp-route" + "name": "cakephp-mysql-example" }, "spec": { "host": "${APPLICATION_DOMAIN}", "to": { "kind": "Service", - "name": "cakephp-frontend" + "name": "cakephp-mysql-example" } } }, @@ -53,7 +53,7 @@ "kind": "ImageStream", "apiVersion": "v1", "metadata": { - "name": "cakephp-example", + "name": "cakephp-mysql-example", "annotations": { "description": "Keeps track of changes in the application image" } @@ -63,7 +63,7 @@ "kind": "BuildConfig", "apiVersion": "v1", "metadata": { - "name": "cakephp-example", + "name": "cakephp-mysql-example", "annotations": { "description": "Defines how to build the application" } @@ -90,7 +90,7 @@ "output": { "to": { "kind": "ImageStreamTag", - "name": "cakephp-example:latest" + "name": "cakephp-mysql-example:latest" } }, "triggers": [ @@ -110,7 +110,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "cakephp-frontend", + "name": "cakephp-mysql-example", "annotations": { "description": "Defines how to deploy the application server" } @@ -125,7 +125,7 @@ "command": [ "./migrate-database.sh" ], - "containerName": "cakephp-example" + "containerName": "cakephp-mysql-example" } } } @@ -136,11 +136,11 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "cakephp-example" + "cakephp-mysql-example" ], "from": { "kind": "ImageStreamTag", - "name": "cakephp-example:latest" + "name": "cakephp-mysql-example:latest" } } }, @@ -150,20 +150,20 @@ ], "replicas": 1, "selector": { - "name": "cakephp-frontend" + "name": "cakephp-mysql-example" }, "template": { "metadata": { - "name": "cakephp-frontend", + "name": "cakephp-mysql-example", "labels": { - "name": "cakephp-frontend" + "name": "cakephp-mysql-example" } }, "spec": { "containers": [ { - "name": "cakephp-example", - "image": "cakephp-example", + "name": "cakephp-mysql-example", + "image": "cakephp-mysql-example", "ports": [ { "containerPort": 8080 @@ -308,7 +308,7 @@ { "name": "APPLICATION_DOMAIN", "description": "The exposed hostname that will route to the CakePHP service", - "value": "cakephp-example.openshiftapps.com" + "value": "cakephp-mysql-example.openshiftapps.com" }, { "name": "GITHUB_WEBHOOK_SECRET", diff --git a/roles/openshift_examples/files/examples/quickstart-templates/cakephp.json b/roles/openshift_examples/files/examples/quickstart-templates/cakephp.json index 09521add4..532b9bd2b 100644 --- a/roles/openshift_examples/files/examples/quickstart-templates/cakephp.json +++ b/roles/openshift_examples/files/examples/quickstart-templates/cakephp.json @@ -17,7 +17,7 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "cakephp-frontend", + "name": "cakephp-example", "annotations": { "description": "Exposes and load balances the application pods" } @@ -31,7 +31,7 @@ } ], "selector": { - "name": "cakephp-frontend" + "name": "cakephp-example" } } }, @@ -39,13 +39,13 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "cakephp-route" + "name": "cakephp-example" }, "spec": { "host": "${APPLICATION_DOMAIN}", "to": { "kind": "Service", - "name": "cakephp-frontend" + "name": "cakephp-example" } } }, @@ -110,7 +110,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "cakephp-frontend", + "name": "cakephp-example", "annotations": { "description": "Defines how to deploy the application server" } @@ -139,13 +139,13 @@ ], "replicas": 1, "selector": { - "name": "cakephp-frontend" + "name": "cakephp-example" }, "template": { "metadata": { - "name": "cakephp-frontend", + "name": "cakephp-example", "labels": { - "name": "cakephp-frontend" + "name": "cakephp-example" } }, "spec": { diff --git a/roles/openshift_examples/files/examples/quickstart-templates/dancer-mysql.json b/roles/openshift_examples/files/examples/quickstart-templates/dancer-mysql.json index fc92a1d6c..b46abfbb5 100644 --- a/roles/openshift_examples/files/examples/quickstart-templates/dancer-mysql.json +++ b/roles/openshift_examples/files/examples/quickstart-templates/dancer-mysql.json @@ -17,7 +17,7 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "dancer-frontend", + "name": "dancer-mysql-example", "annotations": { "description": "Exposes and load balances the application pods" } @@ -31,7 +31,7 @@ } ], "selector": { - "name": "dancer-frontend" + "name": "dancer-mysql-example" } } }, @@ -39,13 +39,13 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "dancer-route" + "name": "dancer-mysql-example" }, "spec": { "host": "${APPLICATION_DOMAIN}", "to": { "kind": "Service", - "name": "dancer-frontend" + "name": "dancer-mysql-example" } } }, @@ -53,7 +53,7 @@ "kind": "ImageStream", "apiVersion": "v1", "metadata": { - "name": "dancer-example", + "name": "dancer-mysql-example", "annotations": { "description": "Keeps track of changes in the application image" } @@ -63,7 +63,7 @@ "kind": "BuildConfig", "apiVersion": "v1", "metadata": { - "name": "dancer-example", + "name": "dancer-mysql-example", "annotations": { "description": "Defines how to build the application" } @@ -90,7 +90,7 @@ "output": { "to": { "kind": "ImageStreamTag", - "name": "dancer-example:latest" + "name": "dancer-mysql-example:latest" } }, "triggers": [ @@ -110,7 +110,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "dancer-frontend", + "name": "dancer-mysql-example", "annotations": { "description": "Defines how to deploy the application server" } @@ -122,11 +122,11 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "dancer-example" + "dancer-mysql-example" ], "from": { "kind": "ImageStreamTag", - "name": "dancer-example:latest" + "name": "dancer-mysql-example:latest" } } }, @@ -136,20 +136,20 @@ ], "replicas": 1, "selector": { - "name": "dancer-frontend" + "name": "dancer-mysql-example" }, "template": { "metadata": { - "name": "dancer-frontend", + "name": "dancer-mysql-example", "labels": { - "name": "dancer-frontend" + "name": "dancer-mysql-example" } }, "spec": { "containers": [ { - "name": "dancer-example", - "image": "dancer-example", + "name": "dancer-mysql-example", + "image": "dancer-mysql-example", "ports": [ { "containerPort": 8080 @@ -282,7 +282,7 @@ { "name": "APPLICATION_DOMAIN", "description": "The exposed hostname that will route to the Dancer service", - "value": "dancer-example.openshiftapps.com" + "value": "dancer-mysql-example.openshiftapps.com" }, { "name": "GITHUB_WEBHOOK_SECRET", diff --git a/roles/openshift_examples/files/examples/quickstart-templates/dancer.json b/roles/openshift_examples/files/examples/quickstart-templates/dancer.json index 829f50bae..6f49a7d64 100644 --- a/roles/openshift_examples/files/examples/quickstart-templates/dancer.json +++ b/roles/openshift_examples/files/examples/quickstart-templates/dancer.json @@ -17,7 +17,7 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "dancer-frontend", + "name": "dancer-example", "annotations": { "description": "Exposes and load balances the application pods" } @@ -31,7 +31,7 @@ } ], "selector": { - "name": "dancer-frontend" + "name": "dancer-example" } } }, @@ -39,13 +39,13 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "dancer-route" + "name": "dancer-example" }, "spec": { "host": "${APPLICATION_DOMAIN}", "to": { "kind": "Service", - "name": "dancer-frontend" + "name": "dancer-example" } } }, @@ -110,7 +110,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "dancer-frontend", + "name": "dancer-example", "annotations": { "description": "Defines how to deploy the application server" } @@ -139,13 +139,13 @@ ], "replicas": 1, "selector": { - "name": "dancer-frontend" + "name": "dancer-example" }, "template": { "metadata": { - "name": "dancer-frontend", + "name": "dancer-example", "labels": { - "name": "dancer-frontend" + "name": "dancer-example" } }, "spec": { diff --git a/roles/openshift_examples/files/examples/quickstart-templates/django-postgresql.json b/roles/openshift_examples/files/examples/quickstart-templates/django-postgresql.json index c46476e8a..64522ce76 100644 --- a/roles/openshift_examples/files/examples/quickstart-templates/django-postgresql.json +++ b/roles/openshift_examples/files/examples/quickstart-templates/django-postgresql.json @@ -17,7 +17,7 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "django-frontend", + "name": "django-postgresql-example", "annotations": { "description": "Exposes and load balances the application pods" } @@ -31,7 +31,7 @@ } ], "selector": { - "name": "django-frontend" + "name": "django-postgresql-example" } } }, @@ -39,13 +39,13 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "django-route" + "name": "django-postgresql-example" }, "spec": { "host": "${APPLICATION_DOMAIN}", "to": { "kind": "Service", - "name": "django-frontend" + "name": "django-postgresql-example" } } }, @@ -53,7 +53,7 @@ "kind": "ImageStream", "apiVersion": "v1", "metadata": { - "name": "django-example", + "name": "django-postgresql-example", "annotations": { "description": "Keeps track of changes in the application image" } @@ -63,7 +63,7 @@ "kind": "BuildConfig", "apiVersion": "v1", "metadata": { - "name": "django-example", + "name": "django-postgresql-example", "annotations": { "description": "Defines how to build the application" } @@ -90,7 +90,7 @@ "output": { "to": { "kind": "ImageStreamTag", - "name": "django-example:latest" + "name": "django-postgresql-example:latest" } }, "triggers": [ @@ -110,7 +110,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "django-frontend", + "name": "django-postgresql-example", "annotations": { "description": "Defines how to deploy the application server" } @@ -125,11 +125,11 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "django-example" + "django-postgresql-example" ], "from": { "kind": "ImageStreamTag", - "name": "django-example:latest" + "name": "django-postgresql-example:latest" } } }, @@ -139,20 +139,20 @@ ], "replicas": 1, "selector": { - "name": "django-frontend" + "name": "django-postgresql-example" }, "template": { "metadata": { - "name": "django-frontend", + "name": "django-postgresql-example", "labels": { - "name": "django-frontend" + "name": "django-postgresql-example" } }, "spec": { "containers": [ { - "name": "django-example", - "image": "django-example", + "name": "django-postgresql-example", + "image": "django-postgresql-example", "ports": [ { "containerPort": 8080 @@ -293,7 +293,7 @@ { "name": "APPLICATION_DOMAIN", "description": "The exposed hostname that will route to the Django service", - "value": "django-example.openshiftapps.com" + "value": "django-postgresql-example.openshiftapps.com" }, { "name": "GITHUB_WEBHOOK_SECRET", diff --git a/roles/openshift_examples/files/examples/quickstart-templates/django.json b/roles/openshift_examples/files/examples/quickstart-templates/django.json index 74bbea163..1794d196c 100644 --- a/roles/openshift_examples/files/examples/quickstart-templates/django.json +++ b/roles/openshift_examples/files/examples/quickstart-templates/django.json @@ -17,7 +17,7 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "django-frontend", + "name": "django-example", "annotations": { "description": "Exposes and load balances the application pods" } @@ -31,7 +31,7 @@ } ], "selector": { - "name": "django-frontend" + "name": "django-example" } } }, @@ -39,13 +39,13 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "django-route" + "name": "django-example" }, "spec": { "host": "${APPLICATION_DOMAIN}", "to": { "kind": "Service", - "name": "django-frontend" + "name": "django-example" } } }, @@ -110,7 +110,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "django-frontend", + "name": "django-example", "annotations": { "description": "Defines how to deploy the application server" } @@ -139,13 +139,13 @@ ], "replicas": 1, "selector": { - "name": "django-frontend" + "name": "django-example" }, "template": { "metadata": { - "name": "django-frontend", + "name": "django-example", "labels": { - "name": "django-frontend" + "name": "django-example" } }, "spec": { diff --git a/roles/openshift_examples/files/examples/quickstart-templates/nodejs-mongodb.json b/roles/openshift_examples/files/examples/quickstart-templates/nodejs-mongodb.json index cd9e5faf0..e281feecf 100644 --- a/roles/openshift_examples/files/examples/quickstart-templates/nodejs-mongodb.json +++ b/roles/openshift_examples/files/examples/quickstart-templates/nodejs-mongodb.json @@ -17,7 +17,7 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "nodejs-frontend", + "name": "nodejs-mongodb-example", "annotations": { "description": "Exposes and load balances the application pods" } @@ -31,7 +31,7 @@ } ], "selector": { - "name": "nodejs-frontend" + "name": "nodejs-mongodb-example" } } }, @@ -39,13 +39,13 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "nodejs-route" + "name": "nodejs-mongodb-example" }, "spec": { "host": "${APPLICATION_DOMAIN}", "to": { "kind": "Service", - "name": "nodejs-frontend" + "name": "nodejs-mongodb-example" } } }, @@ -53,7 +53,7 @@ "kind": "ImageStream", "apiVersion": "v1", "metadata": { - "name": "nodejs-example", + "name": "nodejs-mongodb-example", "annotations": { "description": "Keeps track of changes in the application image" } @@ -63,7 +63,7 @@ "kind": "BuildConfig", "apiVersion": "v1", "metadata": { - "name": "nodejs-example", + "name": "nodejs-mongodb-example", "annotations": { "description": "Defines how to build the application" } @@ -90,7 +90,7 @@ "output": { "to": { "kind": "ImageStreamTag", - "name": "nodejs-example:latest" + "name": "nodejs-mongodb-example:latest" } }, "triggers": [ @@ -110,7 +110,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "nodejs-frontend", + "name": "nodejs-mongodb-example", "annotations": { "description": "Defines how to deploy the application server" } @@ -125,11 +125,11 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "nodejs-example" + "nodejs-mongodb-example" ], "from": { "kind": "ImageStreamTag", - "name": "nodejs-example:latest" + "name": "nodejs-mongodb-example:latest" } } }, @@ -139,20 +139,20 @@ ], "replicas": 1, "selector": { - "name": "nodejs-frontend" + "name": "nodejs-mongodb-example" }, "template": { "metadata": { - "name": "nodejs-frontend", + "name": "nodejs-mongodb-example", "labels": { - "name": "nodejs-frontend" + "name": "nodejs-mongodb-example" } }, "spec": { "containers": [ { - "name": "nodejs-example", - "image": "nodejs-example", + "name": "nodejs-mongodb-example", + "image": "nodejs-mongodb-example", "ports": [ { "containerPort": 8080 @@ -289,7 +289,7 @@ { "name": "APPLICATION_DOMAIN", "description": "The exposed hostname that will route to the Node.js service", - "value": "nodejs-example.openshiftapps.com" + "value": "nodejs-mongodb-example.openshiftapps.com" }, { "name": "GITHUB_WEBHOOK_SECRET", diff --git a/roles/openshift_examples/files/examples/quickstart-templates/nodejs.json b/roles/openshift_examples/files/examples/quickstart-templates/nodejs.json index ff7dd574e..dd38571eb 100644 --- a/roles/openshift_examples/files/examples/quickstart-templates/nodejs.json +++ b/roles/openshift_examples/files/examples/quickstart-templates/nodejs.json @@ -17,7 +17,7 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "nodejs-frontend", + "name": "nodejs-example", "annotations": { "description": "Exposes and load balances the application pods" } @@ -31,7 +31,7 @@ } ], "selector": { - "name": "nodejs-frontend" + "name": "nodejs-example" } } }, @@ -39,13 +39,13 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "nodejs-route" + "name": "nodejs-example" }, "spec": { "host": "${APPLICATION_DOMAIN}", "to": { "kind": "Service", - "name": "nodejs-frontend" + "name": "nodejs-example" } } }, @@ -110,7 +110,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "nodejs-frontend", + "name": "nodejs-example", "annotations": { "description": "Defines how to deploy the application server" } @@ -139,13 +139,13 @@ ], "replicas": 1, "selector": { - "name": "nodejs-frontend" + "name": "nodejs-example" }, "template": { "metadata": { - "name": "nodejs-frontend", + "name": "nodejs-example", "labels": { - "name": "nodejs-frontend" + "name": "nodejs-example" } }, "spec": { diff --git a/roles/openshift_examples/files/examples/quickstart-templates/rails-postgresql.json b/roles/openshift_examples/files/examples/quickstart-templates/rails-postgresql.json index ec7da77e3..3b83d3f5b 100644 --- a/roles/openshift_examples/files/examples/quickstart-templates/rails-postgresql.json +++ b/roles/openshift_examples/files/examples/quickstart-templates/rails-postgresql.json @@ -17,7 +17,7 @@ "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "rails-frontend", + "name": "rails-postgresql-example", "annotations": { "description": "Exposes and load balances the application pods" } @@ -31,7 +31,7 @@ } ], "selector": { - "name": "rails-frontend" + "name": "rails-postgresql-example" } } }, @@ -39,13 +39,13 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "rails-route" + "name": "rails-postgresql-example" }, "spec": { "host": "${APPLICATION_DOMAIN}", "to": { "kind": "Service", - "name": "rails-frontend" + "name": "rails-postgresql-example" } } }, @@ -53,7 +53,7 @@ "kind": "ImageStream", "apiVersion": "v1", "metadata": { - "name": "rails-example", + "name": "rails-postgresql-example", "annotations": { "description": "Keeps track of changes in the application image" } @@ -63,7 +63,7 @@ "kind": "BuildConfig", "apiVersion": "v1", "metadata": { - "name": "rails-example", + "name": "rails-postgresql-example", "annotations": { "description": "Defines how to build the application" } @@ -90,7 +90,7 @@ "output": { "to": { "kind": "ImageStreamTag", - "name": "rails-example:latest" + "name": "rails-postgresql-example:latest" } }, "triggers": [ @@ -110,7 +110,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "rails-frontend", + "name": "rails-postgresql-example", "annotations": { "description": "Defines how to deploy the application server" } @@ -125,7 +125,7 @@ "command": [ "./migrate-database.sh" ], - "containerName": "rails-example" + "containerName": "rails-postgresql-example" } } } @@ -136,11 +136,11 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "rails-example" + "rails-postgresql-example" ], "from": { "kind": "ImageStreamTag", - "name": "rails-example:latest" + "name": "rails-postgresql-example:latest" } } }, @@ -150,20 +150,20 @@ ], "replicas": 1, "selector": { - "name": "rails-frontend" + "name": "rails-postgresql-example" }, "template": { "metadata": { - "name": "rails-frontend", + "name": "rails-postgresql-example", "labels": { - "name": "rails-frontend" + "name": "rails-postgresql-example" } }, "spec": { "containers": [ { - "name": "rails-example", - "image": "rails-example", + "name": "rails-postgresql-example", + "image": "rails-postgresql-example", "ports": [ { "containerPort": 8080 @@ -328,7 +328,7 @@ { "name": "APPLICATION_DOMAIN", "description": "The exposed hostname that will route to the Rails service", - "value": "rails-example.openshiftapps.com" + "value": "rails-postgresql-example.openshiftapps.com" }, { "name": "GITHUB_WEBHOOK_SECRET", diff --git a/roles/openshift_examples/files/examples/xpaas-templates/amq6-persistent.json b/roles/openshift_examples/files/examples/xpaas-templates/amq6-persistent.json index c0925b453..5cbc7ee7e 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/amq6-persistent.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/amq6-persistent.json @@ -320,37 +320,37 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-amq-amqp", + "name": "amqp", "containerPort": 5672, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-amqp-ssl", + "name": "amqp-ssl", "containerPort": 5671, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-mqtt", + "name": "mqtt", "containerPort": 1883, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-stomp", + "name": "stomp", "containerPort": 61613, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-stomp-ssl", + "name": "stomp-ssl", "containerPort": 61612, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-tcp", + "name": "tcp", "containerPort": 61616, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-tcp-ssl", + "name": "tcp-ssl", "containerPort": 61617, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/amq6.json b/roles/openshift_examples/files/examples/xpaas-templates/amq6.json index 63ec9a235..7decdfe52 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/amq6.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/amq6.json @@ -311,37 +311,37 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-amq-amqp", + "name": "amqp", "containerPort": 5672, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-amqp-ssl", + "name": "amqp-ssl", "containerPort": 5671, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-mqtt", + "name": "mqtt", "containerPort": 1883, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-stomp", + "name": "stomp", "containerPort": 61613, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-stomp-ssl", + "name": "stomp-ssl", "containerPort": 61612, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-tcp", + "name": "tcp", "containerPort": 61616, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-tcp-ssl", + "name": "tcp-ssl", "containerPort": 61617, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json index 0790d6546..c30832c78 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json @@ -309,24 +309,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -397,17 +398,17 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-ping-8888", + "name": "ping", "containerPort": 8888, "protocol": "TCP" } @@ -538,37 +539,37 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-amq-amqp", + "name": "amqp", "containerPort": 5672, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-amqp-ssl", + "name": "amqp-ssl", "containerPort": 5671, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-mqtt", + "name": "mqtt", "containerPort": 1883, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-stomp", + "name": "stomp", "containerPort": 61613, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-stomp-ssl", + "name": "stomp-ssl", "containerPort": 61612, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-tcp", + "name": "tcp", "containerPort": 61616, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-tcp-ssl", + "name": "tcp-ssl", "containerPort": 61617, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-sti.json index a0505f81e..cbdc69562 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-sti.json @@ -304,24 +304,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -392,17 +393,17 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-ping-8888", + "name": "ping", "containerPort": 8888, "protocol": "TCP" } @@ -533,37 +534,37 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-amq-amqp", + "name": "amqp", "containerPort": 5672, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-amqp-ssl", + "name": "amqp-ssl", "containerPort": 5671, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-mqtt", + "name": "mqtt", "containerPort": 1883, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-stomp", + "name": "stomp", "containerPort": 61613, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-stomp-ssl", + "name": "stomp-ssl", "containerPort": 61612, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-tcp", + "name": "tcp", "containerPort": 61616, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-amq-tcp-ssl", + "name": "tcp-ssl", "containerPort": 61617, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-basic-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-basic-sti.json index d894deda0..76548a7fa 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-basic-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-basic-sti.json @@ -181,24 +181,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -261,12 +262,12 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-ping-8888", + "name": "ping", "containerPort": 8888, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-https-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-https-sti.json index 14585d60f..e13224a60 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-https-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-https-sti.json @@ -248,24 +248,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -336,17 +337,17 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-ping-8888", + "name": "ping", "containerPort": 8888, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-mongodb-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-mongodb-persistent-sti.json index 13d4289ae..e80a909a7 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-mongodb-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-mongodb-persistent-sti.json @@ -328,24 +328,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -416,17 +417,17 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-ping-8888", + "name": "ping", "containerPort": 8888, "protocol": "TCP" } @@ -568,7 +569,6 @@ "imagePullPolicy": "Always", "ports": [ { - "name": "${APPLICATION_NAME}-mongodb-tcp-27017", "containerPort": 27017, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-mongodb-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-mongodb-sti.json index 690b918a1..1bf918eb1 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-mongodb-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-mongodb-sti.json @@ -323,24 +323,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -411,17 +412,17 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-ping-8888", + "name": "ping", "containerPort": 8888, "protocol": "TCP" } @@ -563,7 +564,6 @@ "imagePullPolicy": "Always", "ports": [ { - "name": "${APPLICATION_NAME}-mongodb-tcp-27017", "containerPort": 27017, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-mysql-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-mysql-persistent-sti.json index 27062596f..505b89043 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-mysql-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-mysql-persistent-sti.json @@ -330,24 +330,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -418,17 +419,17 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-ping-8888", + "name": "ping", "containerPort": 8888, "protocol": "TCP" } @@ -570,7 +571,6 @@ "imagePullPolicy": "Always", "ports": [ { - "name": "${APPLICATION_NAME}-mysql-tcp-3306", "containerPort": 3306, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-mysql-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-mysql-sti.json index 69537e697..5d8b75992 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-mysql-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-mysql-sti.json @@ -325,24 +325,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -413,17 +414,17 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-ping-8888", + "name": "ping", "containerPort": 8888, "protocol": "TCP" } @@ -565,7 +566,6 @@ "imagePullPolicy": "Always", "ports": [ { - "name": "${APPLICATION_NAME}-mysql-tcp-3306", "containerPort": 3306, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-postgresql-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-postgresql-persistent-sti.json index 1325e26de..95e1be2e3 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-postgresql-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-postgresql-persistent-sti.json @@ -318,24 +318,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -406,17 +407,17 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-ping-8888", + "name": "ping", "containerPort": 8888, "protocol": "TCP" } @@ -558,7 +559,6 @@ "imagePullPolicy": "Always", "ports": [ { - "name": "${APPLICATION_NAME}-postgresql-tcp-5432", "containerPort": 5432, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-postgresql-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-postgresql-sti.json index 83921c57e..d558e5182 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-postgresql-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-postgresql-sti.json @@ -313,24 +313,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -401,17 +402,17 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-ping-8888", + "name": "ping", "containerPort": 8888, "protocol": "TCP" } @@ -553,7 +554,6 @@ "imagePullPolicy": "Always", "ports": [ { - "name": "${APPLICATION_NAME}-postgresql-tcp-5432", "containerPort": 5432, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-basic-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-basic-sti.json index a3947593c..51a3d1846 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-basic-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-basic-sti.json @@ -151,24 +151,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -231,7 +232,7 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-https-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-https-sti.json index 1f9c17cf2..f81f54e30 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-https-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-https-sti.json @@ -218,24 +218,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -306,12 +307,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mongodb-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mongodb-persistent-sti.json index 55746fc11..11c305441 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mongodb-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mongodb-persistent-sti.json @@ -299,24 +299,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -387,12 +388,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -522,7 +523,6 @@ "imagePullPolicy": "Always", "ports": [ { - "name": "${APPLICATION_NAME}-mongodb-tcp-27017", "containerPort": 27017, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mongodb-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mongodb-sti.json index f540c885c..99815e87a 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mongodb-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mongodb-sti.json @@ -294,24 +294,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -382,12 +383,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -517,7 +518,6 @@ "imagePullPolicy": "Always", "ports": [ { - "name": "${APPLICATION_NAME}-mongodb-tcp-27017", "containerPort": 27017, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mysql-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mysql-persistent-sti.json index 984b075a2..2f1e68206 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mysql-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mysql-persistent-sti.json @@ -301,24 +301,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -389,12 +390,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -519,7 +520,6 @@ "image": "mysql", "ports": [ { - "name": "${APPLICATION_NAME}-mysql-tcp-3306", "containerPort": 3306, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mysql-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mysql-sti.json index af9c7c17c..5087d2ff0 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mysql-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-mysql-sti.json @@ -296,24 +296,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -384,12 +385,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -514,7 +515,6 @@ "image": "mysql", "ports": [ { - "name": "${APPLICATION_NAME}-mysql-tcp-3306", "containerPort": 3306, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-persistent-sti.json index ec59a6a5b..c28188cc0 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-persistent-sti.json @@ -289,24 +289,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -377,12 +378,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -507,7 +508,6 @@ "image": "postgresql", "ports": [ { - "name": "${APPLICATION_NAME}-postgresql-tcp-5432", "containerPort": 5432, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json index 6040f7208..4f4b2ba44 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat7-postgresql-sti.json @@ -284,24 +284,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -372,12 +373,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -502,7 +503,6 @@ "image": "postgresql", "ports": [ { - "name": "${APPLICATION_NAME}-postgresql-tcp-5432", "containerPort": 5432, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-basic-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-basic-sti.json index 25b6497b2..c8d130c37 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-basic-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-basic-sti.json @@ -151,24 +151,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -231,7 +232,7 @@ }, "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-https-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-https-sti.json index af4c94ae0..867b5a5da 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-https-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-https-sti.json @@ -218,24 +218,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -306,12 +307,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mongodb-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mongodb-persistent-sti.json index b5975b646..4932d6126 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mongodb-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mongodb-persistent-sti.json @@ -299,24 +299,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -387,12 +388,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -522,7 +523,6 @@ "imagePullPolicy": "Always", "ports": [ { - "name": "${APPLICATION_NAME}-mongodb-tcp-27017", "containerPort": 27017, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mongodb-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mongodb-sti.json index 8145ee34e..47977f86b 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mongodb-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mongodb-sti.json @@ -294,24 +294,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -382,12 +383,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -517,7 +518,6 @@ "imagePullPolicy": "Always", "ports": [ { - "name": "${APPLICATION_NAME}-mongodb-tcp-27017", "containerPort": 27017, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mysql-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mysql-persistent-sti.json index b0808949c..a7c8bdb7f 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mysql-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mysql-persistent-sti.json @@ -301,24 +301,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -389,12 +390,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -519,7 +520,6 @@ "image": "mysql", "ports": [ { - "name": "${APPLICATION_NAME}-mysql-tcp-3306", "containerPort": 3306, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mysql-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mysql-sti.json index 46ad18b91..83af5a158 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mysql-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-mysql-sti.json @@ -296,24 +296,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -384,12 +385,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -514,7 +515,6 @@ "image": "mysql", "ports": [ { - "name": "${APPLICATION_NAME}-mysql-tcp-3306", "containerPort": 3306, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-postgresql-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-postgresql-persistent-sti.json index 19cd2be30..914ccc47c 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-postgresql-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-postgresql-persistent-sti.json @@ -289,24 +289,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -377,12 +378,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -507,7 +508,6 @@ "image": "postgresql", "ports": [ { - "name": "${APPLICATION_NAME}-postgresql-tcp-5432", "containerPort": 5432, "protocol": "TCP" } diff --git a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-postgresql-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-postgresql-sti.json index 185808baf..ed95798e4 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-postgresql-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/jws-tomcat8-postgresql-sti.json @@ -284,24 +284,25 @@ }, "output": { "to": { - "name": "${APPLICATION_NAME}" + "kind": "ImageStreamTag", + "name": "${APPLICATION_NAME}:latest" } }, "triggers": [ { - "type": "github", + "type": "Github", "github": { "secret": "${GITHUB_TRIGGER_SECRET}" } }, { - "type": "generic", + "type": "Generic", "generic": { "secret": "${GENERIC_TRIGGER_SECRET}" } }, { - "type": "imageChange", + "type": "ImageChange", "imageChange": {} } ] @@ -372,12 +373,12 @@ ], "ports": [ { - "name": "${APPLICATION_NAME}-tcp-8080", + "name": "http", "containerPort": 8080, "protocol": "TCP" }, { - "name": "${APPLICATION_NAME}-tcp-8443", + "name": "https", "containerPort": 8443, "protocol": "TCP" } @@ -502,7 +503,6 @@ "image": "postgresql", "ports": [ { - "name": "${APPLICATION_NAME}-postgresql-tcp-5432", "containerPort": 5432, "protocol": "TCP" } |