summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/openshift_examples/files/examples/db-templates/mongodb-ephemeral-template.json21
-rw-r--r--roles/openshift_examples/files/examples/db-templates/mongodb-persistent-template.json26
-rw-r--r--roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json18
-rw-r--r--roles/openshift_examples/files/examples/db-templates/mysql-persistent-template.json23
-rw-r--r--roles/openshift_examples/files/examples/db-templates/postgresql-ephemeral-template.json18
-rw-r--r--roles/openshift_examples/files/examples/db-templates/postgresql-persistent-template.json23
-rw-r--r--roles/openshift_examples/files/examples/quickstart-templates/cakephp-mysql.json11
-rw-r--r--roles/openshift_examples/files/examples/quickstart-templates/cakephp.json4
-rw-r--r--roles/openshift_examples/files/examples/quickstart-templates/dancer-mysql.json29
-rw-r--r--roles/openshift_examples/files/examples/quickstart-templates/dancer.json4
-rw-r--r--roles/openshift_examples/files/examples/quickstart-templates/django-postgresql.json45
-rw-r--r--roles/openshift_examples/files/examples/quickstart-templates/django.json4
-rw-r--r--roles/openshift_examples/files/examples/quickstart-templates/nodejs-mongodb.json35
-rw-r--r--roles/openshift_examples/files/examples/quickstart-templates/nodejs.json4
-rw-r--r--roles/openshift_examples/files/examples/quickstart-templates/rails-postgresql.json38
15 files changed, 183 insertions, 120 deletions
diff --git a/roles/openshift_examples/files/examples/db-templates/mongodb-ephemeral-template.json b/roles/openshift_examples/files/examples/db-templates/mongodb-ephemeral-template.json
index 6252da2ec..6b90fa54e 100644
--- a/roles/openshift_examples/files/examples/db-templates/mongodb-ephemeral-template.json
+++ b/roles/openshift_examples/files/examples/db-templates/mongodb-ephemeral-template.json
@@ -1,6 +1,6 @@
{
"kind": "Template",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "mongodb-ephemeral",
"creationTimestamp": null,
@@ -13,7 +13,7 @@
"objects": [
{
"kind": "Service",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -41,7 +41,7 @@
},
{
"kind": "DeploymentConfig",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -147,30 +147,35 @@
{
"name": "DATABASE_SERVICE_NAME",
"description": "Database service name",
- "value": "mongodb"
+ "value": "mongodb",
+ "required": true
},
{
"name": "MONGODB_USER",
"description": "Username for MongoDB user that will be used for accessing the database",
"generate": "expression",
- "from": "user[A-Z0-9]{3}"
+ "from": "user[A-Z0-9]{3}",
+ "required": true
},
{
"name": "MONGODB_PASSWORD",
"description": "Password for the MongoDB user",
"generate": "expression",
- "from": "[a-zA-Z0-9]{16}"
+ "from": "[a-zA-Z0-9]{16}",
+ "required": true
},
{
"name": "MONGODB_DATABASE",
"description": "Database name",
- "value": "sampledb"
+ "value": "sampledb",
+ "required": true
},
{
"name": "MONGODB_ADMIN_PASSWORD",
"description": "Password for the database admin user",
"generate": "expression",
- "from": "[a-zA-Z0-9]{16}"
+ "from": "[a-zA-Z0-9]{16}",
+ "required": true
}
],
"labels": {
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 c05e81e56..97b315600 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
@@ -1,6 +1,6 @@
{
"kind": "Template",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "mongodb-persistent",
"creationTimestamp": null,
@@ -13,7 +13,7 @@
"objects": [
{
"kind": "Service",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -41,7 +41,7 @@
},
{
"kind": "PersistentVolumeClaim",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}"
},
@@ -58,7 +58,7 @@
},
{
"kind": "DeploymentConfig",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -164,35 +164,41 @@
{
"name": "DATABASE_SERVICE_NAME",
"description": "Database service name",
- "value": "mongodb"
+ "value": "mongodb",
+ "required": true
},
{
"name": "MONGODB_USER",
"description": "Username for MongoDB user that will be used for accessing the database",
"generate": "expression",
- "from": "user[A-Z0-9]{3}"
+ "from": "user[A-Z0-9]{3}",
+ "required": true
},
{
"name": "MONGODB_PASSWORD",
"description": "Password for the MongoDB user",
"generate": "expression",
- "from": "[a-zA-Z0-9]{16}"
+ "from": "[a-zA-Z0-9]{16}",
+ "required": true
},
{
"name": "MONGODB_DATABASE",
"description": "Database name",
- "value": "sampledb"
+ "value": "sampledb",
+ "required": true
},
{
"name": "MONGODB_ADMIN_PASSWORD",
"description": "Password for the database admin user",
"generate": "expression",
- "from": "[a-zA-Z0-9]{16}"
+ "from": "[a-zA-Z0-9]{16}",
+ "required": true
},
{
"name": "VOLUME_CAPACITY",
"description": "Volume space available for data, e.g. 512Mi, 2Gi",
- "value": "512Mi"
+ "value": "512Mi",
+ "required": true
}
],
"labels": {
diff --git a/roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json b/roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json
index 697a4ad68..b384a5992 100644
--- a/roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json
+++ b/roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json
@@ -1,6 +1,6 @@
{
"kind": "Template",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "mysql-ephemeral",
"creationTimestamp": null,
@@ -13,7 +13,7 @@
"objects": [
{
"kind": "Service",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -41,7 +41,7 @@
},
{
"kind": "DeploymentConfig",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -143,24 +143,28 @@
{
"name": "DATABASE_SERVICE_NAME",
"description": "Database service name",
- "value": "mysql"
+ "value": "mysql",
+ "required": true
},
{
"name": "MYSQL_USER",
"description": "Username for MySQL user that will be used for accessing the database",
"generate": "expression",
- "from": "user[A-Z0-9]{3}"
+ "from": "user[A-Z0-9]{3}",
+ "required": true
},
{
"name": "MYSQL_PASSWORD",
"description": "Password for the MySQL user",
"generate": "expression",
- "from": "[a-zA-Z0-9]{16}"
+ "from": "[a-zA-Z0-9]{16}",
+ "required": true
},
{
"name": "MYSQL_DATABASE",
"description": "Database name",
- "value": "sampledb"
+ "value": "sampledb",
+ "required": true
}
],
"labels": {
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 33e1cebb1..6e19f48f5 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
@@ -1,6 +1,6 @@
{
"kind": "Template",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "mysql-persistent",
"creationTimestamp": null,
@@ -13,7 +13,7 @@
"objects": [
{
"kind": "Service",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -41,7 +41,7 @@
},
{
"kind": "PersistentVolumeClaim",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}"
},
@@ -58,7 +58,7 @@
},
{
"kind": "DeploymentConfig",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -160,29 +160,34 @@
{
"name": "DATABASE_SERVICE_NAME",
"description": "Database service name",
- "value": "mysql"
+ "value": "mysql",
+ "required": true
},
{
"name": "MYSQL_USER",
"description": "Username for MySQL user that will be used for accessing the database",
"generate": "expression",
- "from": "user[A-Z0-9]{3}"
+ "from": "user[A-Z0-9]{3}",
+ "required": true
},
{
"name": "MYSQL_PASSWORD",
"description": "Password for the MySQL user",
"generate": "expression",
- "from": "[a-zA-Z0-9]{16}"
+ "from": "[a-zA-Z0-9]{16}",
+ "required": true
},
{
"name": "MYSQL_DATABASE",
"description": "Database name",
- "value": "sampledb"
+ "value": "sampledb",
+ "required": true
},
{
"name": "VOLUME_CAPACITY",
"description": "Volume space available for data, e.g. 512Mi, 2Gi",
- "value": "512Mi"
+ "value": "512Mi",
+ "required": true
}
],
"labels": {
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 faf626475..60d6b8519 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
@@ -1,6 +1,6 @@
{
"kind": "Template",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "postgresql-ephemeral",
"creationTimestamp": null,
@@ -13,7 +13,7 @@
"objects": [
{
"kind": "Service",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -41,7 +41,7 @@
},
{
"kind": "DeploymentConfig",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -143,24 +143,28 @@
{
"name": "DATABASE_SERVICE_NAME",
"description": "Database service name",
- "value": "postgresql"
+ "value": "postgresql",
+ "required": true
},
{
"name": "POSTGRESQL_USER",
"description": "Username for PostgreSQL user that will be used for accessing the database",
"generate": "expression",
- "from": "user[A-Z0-9]{3}"
+ "from": "user[A-Z0-9]{3}",
+ "required": true
},
{
"name": "POSTGRESQL_PASSWORD",
"description": "Password for the PostgreSQL user",
"generate": "expression",
- "from": "[a-zA-Z0-9]{16}"
+ "from": "[a-zA-Z0-9]{16}",
+ "required": true
},
{
"name": "POSTGRESQL_DATABASE",
"description": "Database name",
- "value": "sampledb"
+ "value": "sampledb",
+ "required": true
}
],
"labels": {
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 398e288bf..91cd7453e 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
@@ -1,6 +1,6 @@
{
"kind": "Template",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "postgresql-persistent",
"creationTimestamp": null,
@@ -13,7 +13,7 @@
"objects": [
{
"kind": "Service",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -41,7 +41,7 @@
},
{
"kind": "PersistentVolumeClaim",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}"
},
@@ -58,7 +58,7 @@
},
{
"kind": "DeploymentConfig",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -160,29 +160,34 @@
{
"name": "DATABASE_SERVICE_NAME",
"description": "Database service name",
- "value": "postgresql"
+ "value": "postgresql",
+ "required": true
},
{
"name": "POSTGRESQL_USER",
"description": "Username for PostgreSQL user that will be used for accessing the database",
"generate": "expression",
- "from": "user[A-Z0-9]{3}"
+ "from": "user[A-Z0-9]{3}",
+ "required": true
},
{
"name": "POSTGRESQL_PASSWORD",
"description": "Password for the PostgreSQL user",
"generate": "expression",
- "from": "[a-zA-Z0-9]{16}"
+ "from": "[a-zA-Z0-9]{16}",
+ "required": true
},
{
"name": "POSTGRESQL_DATABASE",
"description": "Database name",
- "value": "sampledb"
+ "value": "sampledb",
+ "required": true
},
{
"name": "VOLUME_CAPACITY",
"description": "Volume space available for data, e.g. 512Mi, 2Gi",
- "value": "512Mi"
+ "value": "512Mi",
+ "required": true
}
],
"labels": {
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 b722a05ae..deac2010f 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/cakephp-mysql.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/cakephp-mysql.json
@@ -264,7 +264,7 @@
"containers": [
{
"name": "mysql",
- "image": "openshift/mysql-55-centos7",
+ "image": "${MYSQL_IMAGE}",
"ports": [
{
"containerPort": 3306
@@ -307,8 +307,8 @@
},
{
"name": "APPLICATION_DOMAIN",
- "description": "The exposed hostname that will route to the CakePHP service",
- "value": "cakephp-mysql-example.openshiftapps.com"
+ "description": "The exposed hostname that will route to the CakePHP service, if left blank a value will be defaulted.",
+ "value": ""
},
{
"name": "GITHUB_WEBHOOK_SECRET",
@@ -343,6 +343,11 @@
"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/quickstart-templates/cakephp.json b/roles/openshift_examples/files/examples/quickstart-templates/cakephp.json
index 532b9bd2b..ec556ea13 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/cakephp.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/cakephp.json
@@ -215,8 +215,8 @@
},
{
"name": "APPLICATION_DOMAIN",
- "description": "The exposed hostname that will route to the CakePHP service",
- "value": "cakephp-example.openshiftapps.com"
+ "description": "The exposed hostname that will route to the CakePHP service, if left blank a value will be defaulted.",
+ "value": ""
},
{
"name": "GITHUB_WEBHOOK_SECRET",
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 b46abfbb5..2cbcc0889 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/dancer-mysql.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/dancer-mysql.json
@@ -162,15 +162,15 @@
},
{
"name": "MYSQL_USER",
- "value": "${MYSQL_USER}"
+ "value": "${DATABASE_USER}"
},
{
"name": "MYSQL_PASSWORD",
- "value": "${MYSQL_PASSWORD}"
+ "value": "${DATABASE_PASSWORD}"
},
{
"name": "MYSQL_DATABASE",
- "value": "${MYSQL_DATABASE}"
+ "value": "${DATABASE_NAME}"
},
{
"name": "SECRET_KEY_BASE",
@@ -238,7 +238,7 @@
"containers": [
{
"name": "mysql",
- "image": "openshift/mysql-55-centos7",
+ "image": "${MYSQL_IMAGE}",
"ports": [
{
"containerPort": 3306
@@ -247,15 +247,15 @@
"env": [
{
"name": "MYSQL_USER",
- "value": "${MYSQL_USER}"
+ "value": "${DATABASE_USER}"
},
{
"name": "MYSQL_PASSWORD",
- "value": "${MYSQL_PASSWORD}"
+ "value": "${DATABASE_PASSWORD}"
},
{
"name": "MYSQL_DATABASE",
- "value": "${MYSQL_DATABASE}"
+ "value": "${DATABASE_NAME}"
}
]
}
@@ -281,8 +281,8 @@
},
{
"name": "APPLICATION_DOMAIN",
- "description": "The exposed hostname that will route to the Dancer service",
- "value": "dancer-mysql-example.openshiftapps.com"
+ "description": "The exposed hostname that will route to the Dancer service, if left blank a value will be defaulted.",
+ "value": ""
},
{
"name": "GITHUB_WEBHOOK_SECRET",
@@ -308,23 +308,28 @@
"value": "database"
},
{
- "name": "MYSQL_USER",
+ "name": "DATABASE_USER",
"description": "database username",
"generate": "expression",
"from": "user[A-Z0-9]{3}"
},
{
- "name": "MYSQL_PASSWORD",
+ "name": "DATABASE_PASSWORD",
"description": "database password",
"generate": "expression",
"from": "[a-zA-Z0-9]{8}"
},
{
- "name": "MYSQL_DATABASE",
+ "name": "DATABASE_NAME",
"description": "database name",
"value": "sampledb"
},
{
+ "name": "MYSQL_IMAGE",
+ "description": "Image to use for mysql",
+ "value": "openshift/mysql-55-centos7"
+ },
+ {
"name": "SECRET_KEY_BASE",
"description": "Your secret key for verifying the integrity of signed cookies",
"generate": "expression",
diff --git a/roles/openshift_examples/files/examples/quickstart-templates/dancer.json b/roles/openshift_examples/files/examples/quickstart-templates/dancer.json
index 6f49a7d64..43271dfc5 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/dancer.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/dancer.json
@@ -181,8 +181,8 @@
},
{
"name": "APPLICATION_DOMAIN",
- "description": "The exposed hostname that will route to the Dancer service",
- "value": "dancer-example.openshiftapps.com"
+ "description": "The exposed hostname that will route to the Dancer service, if left blank a value will be defaulted.",
+ "value": ""
},
{
"name": "GITHUB_WEBHOOK_SECRET",
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 64522ce76..749064e98 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/django-postgresql.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/django-postgresql.json
@@ -2,7 +2,7 @@
"kind": "Template",
"apiVersion": "v1",
"metadata": {
- "name": "django-postgresql-example",
+ "name": "django-psql-example",
"annotations": {
"description": "An example Django application with a PostgreSQL database",
"tags": "instant-app,python,django,postgresql",
@@ -10,14 +10,14 @@
}
},
"labels": {
- "template": "django-postgresql-example"
+ "template": "django-psql-example"
},
"objects": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
- "name": "django-postgresql-example",
+ "name": "django-psql-example",
"annotations": {
"description": "Exposes and load balances the application pods"
}
@@ -31,7 +31,7 @@
}
],
"selector": {
- "name": "django-postgresql-example"
+ "name": "django-psql-example"
}
}
},
@@ -39,13 +39,13 @@
"kind": "Route",
"apiVersion": "v1",
"metadata": {
- "name": "django-postgresql-example"
+ "name": "django-psql-example"
},
"spec": {
"host": "${APPLICATION_DOMAIN}",
"to": {
"kind": "Service",
- "name": "django-postgresql-example"
+ "name": "django-psql-example"
}
}
},
@@ -53,7 +53,7 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
- "name": "django-postgresql-example",
+ "name": "django-psql-example",
"annotations": {
"description": "Keeps track of changes in the application image"
}
@@ -63,7 +63,7 @@
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
- "name": "django-postgresql-example",
+ "name": "django-psql-example",
"annotations": {
"description": "Defines how to build the application"
}
@@ -90,7 +90,7 @@
"output": {
"to": {
"kind": "ImageStreamTag",
- "name": "django-postgresql-example:latest"
+ "name": "django-psql-example:latest"
}
},
"triggers": [
@@ -110,7 +110,7 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
- "name": "django-postgresql-example",
+ "name": "django-psql-example",
"annotations": {
"description": "Defines how to deploy the application server"
}
@@ -125,11 +125,11 @@
"imageChangeParams": {
"automatic": true,
"containerNames": [
- "django-postgresql-example"
+ "django-psql-example"
],
"from": {
"kind": "ImageStreamTag",
- "name": "django-postgresql-example:latest"
+ "name": "django-psql-example:latest"
}
}
},
@@ -139,20 +139,20 @@
],
"replicas": 1,
"selector": {
- "name": "django-postgresql-example"
+ "name": "django-psql-example"
},
"template": {
"metadata": {
- "name": "django-postgresql-example",
+ "name": "django-psql-example",
"labels": {
- "name": "django-postgresql-example"
+ "name": "django-psql-example"
}
},
"spec": {
"containers": [
{
- "name": "django-postgresql-example",
- "image": "django-postgresql-example",
+ "name": "django-psql-example",
+ "image": "django-psql-example",
"ports": [
{
"containerPort": 8080
@@ -249,7 +249,7 @@
"containers": [
{
"name": "postgresql",
- "image": "openshift/postgresql-92-centos7",
+ "image": "${POSTGRESQL_IMAGE}",
"ports": [
{
"containerPort": 5432
@@ -292,8 +292,8 @@
},
{
"name": "APPLICATION_DOMAIN",
- "description": "The exposed hostname that will route to the Django service",
- "value": "django-postgresql-example.openshiftapps.com"
+ "description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",
+ "value": ""
},
{
"name": "GITHUB_WEBHOOK_SECRET",
@@ -328,6 +328,11 @@
"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/quickstart-templates/django.json b/roles/openshift_examples/files/examples/quickstart-templates/django.json
index 1794d196c..143a942ab 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/django.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/django.json
@@ -211,8 +211,8 @@
},
{
"name": "APPLICATION_DOMAIN",
- "description": "The exposed hostname that will route to the Django service",
- "value": "django-example.openshiftapps.com"
+ "description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",
+ "value": ""
},
{
"name": "GITHUB_WEBHOOK_SECRET",
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 e281feecf..017b5be19 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/nodejs-mongodb.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/nodejs-mongodb.json
@@ -165,19 +165,19 @@
},
{
"name": "MONGODB_USER",
- "value": "${MONGODB_USER}"
+ "value": "${DATABASE_USER}"
},
{
"name": "MONGODB_PASSWORD",
- "value": "${MONGODB_PASSWORD}"
+ "value": "${DATABASE_PASSWORD}"
},
{
"name": "MONGODB_DATABASE",
- "value": "${MONGODB_DATABASE}"
+ "value": "${DATABASE_NAME}"
},
{
"name": "MONGODB_ADMIN_PASSWORD",
- "value": "${MONGODB_ADMIN_PASSWORD}"
+ "value": "${DATABASE_ADMIN_PASSWORD}"
}
]
}
@@ -241,7 +241,7 @@
"containers": [
{
"name": "mongodb",
- "image": "openshift/mongodb-24-centos7",
+ "image": "${MONGODB_IMAGE}",
"ports": [
{
"containerPort": 27017
@@ -250,19 +250,19 @@
"env": [
{
"name": "MONGODB_USER",
- "value": "${MONGODB_USER}"
+ "value": "${DATABASE_USER}"
},
{
"name": "MONGODB_PASSWORD",
- "value": "${MONGODB_PASSWORD}"
+ "value": "${DATABASE_PASSWORD}"
},
{
"name": "MONGODB_DATABASE",
- "value": "${MONGODB_DATABASE}"
+ "value": "${DATABASE_NAME}"
},
{
"name": "MONGODB_ADMIN_PASSWORD",
- "value": "${MONGODB_ADMIN_PASSWORD}"
+ "value": "${DATABASE_ADMIN_PASSWORD}"
}
]
}
@@ -288,8 +288,8 @@
},
{
"name": "APPLICATION_DOMAIN",
- "description": "The exposed hostname that will route to the Node.js service",
- "value": "nodejs-mongodb-example.openshiftapps.com"
+ "description": "The exposed hostname that will route to the Node.js service, if left blank a value will be defaulted.",
+ "value": ""
},
{
"name": "GITHUB_WEBHOOK_SECRET",
@@ -303,27 +303,32 @@
"value": "mongodb"
},
{
- "name": "MONGODB_USER",
+ "name": "DATABASE_USER",
"description": "Username for MongoDB user that will be used for accessing the database",
"generate": "expression",
"from": "user[A-Z0-9]{3}"
},
{
- "name": "MONGODB_PASSWORD",
+ "name": "DATABASE_PASSWORD",
"description": "Password for the MongoDB user",
"generate": "expression",
"from": "[a-zA-Z0-9]{16}"
},
{
- "name": "MONGODB_DATABASE",
+ "name": "DATABASE_NAME",
"description": "Database name",
"value": "sampledb"
},
{
- "name": "MONGODB_ADMIN_PASSWORD",
+ "name": "DATABASE_ADMIN_PASSWORD",
"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/quickstart-templates/nodejs.json b/roles/openshift_examples/files/examples/quickstart-templates/nodejs.json
index dd38571eb..55488ab41 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/nodejs.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/nodejs.json
@@ -203,8 +203,8 @@
},
{
"name": "APPLICATION_DOMAIN",
- "description": "The exposed hostname that will route to the Node.js service",
- "value": "nodejs-example.openshiftapps.com"
+ "description": "The exposed hostname that will route to the Node.js service, if left blank a value will be defaulted.",
+ "value": ""
},
{
"name": "GITHUB_WEBHOOK_SECRET",
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 3b83d3f5b..b98282528 100644
--- a/roles/openshift_examples/files/examples/quickstart-templates/rails-postgresql.json
+++ b/roles/openshift_examples/files/examples/quickstart-templates/rails-postgresql.json
@@ -176,15 +176,15 @@
},
{
"name": "POSTGRESQL_USER",
- "value": "${POSTGRESQL_USER}"
+ "value": "${DATABASE_USER}"
},
{
"name": "POSTGRESQL_PASSWORD",
- "value": "${POSTGRESQL_PASSWORD}"
+ "value": "${DATABASE_PASSWORD}"
},
{
"name": "POSTGRESQL_DATABASE",
- "value": "${POSTGRESQL_DATABASE}"
+ "value": "${DATABASE_NAME}"
},
{
"name": "SECRET_KEY_BASE",
@@ -213,6 +213,10 @@
{
"name": "APPLICATION_PASSWORD",
"value": "${APPLICATION_PASSWORD}"
+ },
+ {
+ "name": "RAILS_ENV",
+ "value": "${RAILS_ENV}"
}
]
}
@@ -276,7 +280,7 @@
"containers": [
{
"name": "postgresql",
- "image": "openshift/postgresql-92-centos7",
+ "image": "${POSTGRESQL_IMAGE}",
"ports": [
{
"containerPort": 5432
@@ -285,15 +289,15 @@
"env": [
{
"name": "POSTGRESQL_USER",
- "value": "${POSTGRESQL_USER}"
+ "value": "${DATABASE_USER}"
},
{
"name": "POSTGRESQL_PASSWORD",
- "value": "${POSTGRESQL_PASSWORD}"
+ "value": "${DATABASE_PASSWORD}"
},
{
"name": "POSTGRESQL_DATABASE",
- "value": "${POSTGRESQL_DATABASE}"
+ "value": "${DATABASE_NAME}"
},
{
"name": "POSTGRESQL_MAX_CONNECTIONS",
@@ -327,8 +331,8 @@
},
{
"name": "APPLICATION_DOMAIN",
- "description": "The exposed hostname that will route to the Rails service",
- "value": "rails-postgresql-example.openshiftapps.com"
+ "description": "The exposed hostname that will route to the Rails service, if left blank a value will be defaulted.",
+ "value": ""
},
{
"name": "GITHUB_WEBHOOK_SECRET",
@@ -353,28 +357,38 @@
"value": "secret"
},
{
+ "name": "RAILS_ENV",
+ "description": "Environment under which the sample application will run. Could be set to production, development or test",
+ "value": "production"
+ },
+ {
"name": "DATABASE_SERVICE_NAME",
"description": "Database service name",
"value": "postgresql"
},
{
- "name": "POSTGRESQL_USER",
+ "name": "DATABASE_USER",
"description": "database username",
"generate": "expression",
"from": "user[A-Z0-9]{3}"
},
{
- "name": "POSTGRESQL_PASSWORD",
+ "name": "DATABASE_PASSWORD",
"description": "database password",
"generate": "expression",
"from": "[a-zA-Z0-9]{8}"
},
{
- "name": "POSTGRESQL_DATABASE",
+ "name": "DATABASE_NAME",
"description": "database name",
"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"