diff options
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.3/db-templates')
7 files changed, 49 insertions, 12 deletions
diff --git a/roles/openshift_examples/files/examples/v1.3/db-templates/README.md b/roles/openshift_examples/files/examples/v1.3/db-templates/README.md index c66bdb8bf..a36d7ba7d 100644 --- a/roles/openshift_examples/files/examples/v1.3/db-templates/README.md +++ b/roles/openshift_examples/files/examples/v1.3/db-templates/README.md @@ -9,7 +9,7 @@ the Web Console or the CLI. The examples can also be tweaked to create new templates. -## Ephemeral vs Persistent +## Ephemeral vs. Persistent For each supported database, there are two template files. diff --git a/roles/openshift_examples/files/examples/v1.3/db-templates/mongodb-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.3/db-templates/mongodb-ephemeral-template.json index 329e7a692..5ed92b3ad 100644 --- a/roles/openshift_examples/files/examples/v1.3/db-templates/mongodb-ephemeral-template.json +++ b/roles/openshift_examples/files/examples/v1.3/db-templates/mongodb-ephemeral-template.json @@ -31,7 +31,6 @@ "selector": { "name": "${DATABASE_SERVICE_NAME}" }, - "portalIP": "", "type": "ClusterIP", "sessionAffinity": "None" }, @@ -60,7 +59,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mongodb:3.2", + "name": "mongodb:${MONGODB_VERSION}", "namespace": "${NAMESPACE}" }, "lastTriggeredImage": "" @@ -210,6 +209,13 @@ "generate": "expression", "from": "[a-zA-Z0-9]{16}", "required": true + }, + { + "name": "MONGODB_VERSION", + "displayName": "Version of MongoDB Image", + "description": "Version of MongoDB image to be used (2.4, 2.6, 3.2 or latest).", + "value": "3.2", + "required": true } ], "labels": { diff --git a/roles/openshift_examples/files/examples/v1.3/db-templates/mongodb-persistent-template.json b/roles/openshift_examples/files/examples/v1.3/db-templates/mongodb-persistent-template.json index 0fedad71e..00d550d7d 100644 --- a/roles/openshift_examples/files/examples/v1.3/db-templates/mongodb-persistent-template.json +++ b/roles/openshift_examples/files/examples/v1.3/db-templates/mongodb-persistent-template.json @@ -31,7 +31,6 @@ "selector": { "name": "${DATABASE_SERVICE_NAME}" }, - "portalIP": "", "type": "ClusterIP", "sessionAffinity": "None" }, @@ -77,7 +76,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mongodb:3.2", + "name": "mongodb:${MONGODB_VERSION}", "namespace": "${NAMESPACE}" }, "lastTriggeredImage": "" @@ -234,6 +233,13 @@ "description": "Volume space available for data, e.g. 512Mi, 2Gi.", "value": "1Gi", "required": true + }, + { + "name": "MONGODB_VERSION", + "displayName": "Version of MongoDB Image", + "description": "Version of MongoDB image to be used (2.4, 2.6, 3.2 or latest).", + "value": "3.2", + "required": true } ], "labels": { diff --git a/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json index 8a4ec41b2..a7c731243 100644 --- a/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json +++ b/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json @@ -30,7 +30,6 @@ "selector": { "name": "${DATABASE_SERVICE_NAME}" }, - "portalIP": "", "type": "ClusterIP", "sessionAffinity": "None" }, @@ -59,7 +58,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:5.6", + "name": "mysql:${MYSQL_VERSION}", "namespace": "${NAMESPACE}" }, "lastTriggeredImage": "" @@ -198,6 +197,13 @@ "description": "Name of the MySQL database accessed.", "value": "sampledb", "required": true + }, + { + "name": "MYSQL_VERSION", + "displayName": "Version of MySQL Image", + "description": "Version of MySQL image to be used (5.5, 5.6 or latest).", + "value": "5.6", + "required": true } ], "labels": { diff --git a/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-persistent-template.json b/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-persistent-template.json index cae14c998..05add25e2 100644 --- a/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-persistent-template.json +++ b/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-persistent-template.json @@ -65,7 +65,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:5.6", + "name": "mysql:${MYSQL_VERSION}", "namespace": "${NAMESPACE}" } } @@ -200,6 +200,13 @@ "description": "Volume space available for data, e.g. 512Mi, 2Gi.", "value": "1Gi", "required": true + }, + { + "name": "MYSQL_VERSION", + "displayName": "Version of MySQL Image", + "description": "Version of MySQL image to be used (5.5, 5.6 or latest).", + "value": "5.6", + "required": true } ], "labels": { diff --git a/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-ephemeral-template.json index 2b4b2a0cd..1562204e5 100644 --- a/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-ephemeral-template.json +++ b/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-ephemeral-template.json @@ -31,7 +31,6 @@ "selector": { "name": "${DATABASE_SERVICE_NAME}" }, - "portalIP": "", "type": "ClusterIP", "sessionAffinity": "None" }, @@ -60,7 +59,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:9.5", + "name": "postgresql:${POSTGRESQL_VERSION}", "namespace": "${NAMESPACE}" }, "lastTriggeredImage": "" @@ -198,6 +197,13 @@ "description": "Name of the PostgreSQL database accessed.", "value": "sampledb", "required": true + }, + { + "name": "POSTGRESQL_VERSION", + "displayName": "Version of PostgreSQL Image", + "description": "Version of PostgreSQL image to be used (9.2, 9.4, 9.5 or latest).", + "value": "9.5", + "required": true } ], "labels": { diff --git a/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-persistent-template.json b/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-persistent-template.json index 63a04f08f..fd2b6a0fb 100644 --- a/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-persistent-template.json +++ b/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-persistent-template.json @@ -31,7 +31,6 @@ "selector": { "name": "${DATABASE_SERVICE_NAME}" }, - "portalIP": "", "type": "ClusterIP", "sessionAffinity": "None" }, @@ -77,7 +76,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:9.5", + "name": "postgresql:${POSTGRESQL_VERSION}", "namespace": "${NAMESPACE}" }, "lastTriggeredImage": "" @@ -222,6 +221,13 @@ "description": "Volume space available for data, e.g. 512Mi, 2Gi.", "value": "1Gi", "required": true + }, + { + "name": "POSTGRESQL_VERSION", + "displayName": "Version of PostgreSQL Image", + "description": "Version of PostgreSQL image to be used (9.2, 9.4, 9.5 or latest).", + "value": "9.5", + "required": true } ], "labels": { |