diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2017-07-03 11:06:18 -0400 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2017-07-05 10:30:53 -0400 |
commit | 09e74fa8f619038ea06723392ce0d620ffbc6d3a (patch) | |
tree | e3c17249a47ed0d70c99c22ef8f8426655a83245 /roles/openshift_examples/files/examples/v3.6/xpaas-templates/datagrid65-postgresql-persistent.json | |
parent | 7b5c476ecd2e6d3cf26bea294e5b7c141d061384 (diff) | |
parent | 0d0f54af3a02cd0e228210dfae95806d4e644c3b (diff) | |
download | openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.tar.gz openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.tar.bz2 openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.tar.xz openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.zip |
Merge branch 'master' into encryption
Diffstat (limited to 'roles/openshift_examples/files/examples/v3.6/xpaas-templates/datagrid65-postgresql-persistent.json')
-rw-r--r-- | roles/openshift_examples/files/examples/v3.6/xpaas-templates/datagrid65-postgresql-persistent.json | 84 |
1 files changed, 76 insertions, 8 deletions
diff --git a/roles/openshift_examples/files/examples/v3.6/xpaas-templates/datagrid65-postgresql-persistent.json b/roles/openshift_examples/files/examples/v3.6/xpaas-templates/datagrid65-postgresql-persistent.json index 12720eb19..6b90e1370 100644 --- a/roles/openshift_examples/files/examples/v3.6/xpaas-templates/datagrid65-postgresql-persistent.json +++ b/roles/openshift_examples/files/examples/v3.6/xpaas-templates/datagrid65-postgresql-persistent.json @@ -6,82 +6,96 @@ "iconClass": "icon-jboss", "description": "Application template for JDG 6.5 and PostgreSQL applications with persistent storage.", "tags": "datagrid,jboss,xpaas", - "version": "1.3.2" + "version": "1.4.0", + "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5 + PostgreSQL (Persistent with https)" }, "name": "datagrid65-postgresql-persistent" }, "labels": { "template": "datagrid65-postgresql-persistent", - "xpaas": "1.3.2" + "xpaas": "1.4.0" }, + "message": "A new data grid service (using PostgreSQL with persistent storage) has been created in your project. It supports connector type(s) \"${INFINISPAN_CONNECTORS}\". The username/password for accessing the MySQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the \"datagrid-service-account\" service account and the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.", "parameters": [ { + "displayName": "Application Name", "description": "The name for the application.", "name": "APPLICATION_NAME", "value": "datagrid-app", "required": true }, { + "displayName": "Custom http Route Hostname", "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: <application-name>-<project>.<default-domain-suffix>", "name": "HOSTNAME_HTTP", "value": "", "required": false }, { + "displayName": "Custom https Route Hostname", "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-<application-name>-<project>.<default-domain-suffix>", "name": "HOSTNAME_HTTPS", "value": "", "required": false }, { + "displayName": "Username", "description": "User name for JDG user.", "name": "USERNAME", "value": "", "required": false }, { - "description": "Password for JDG user.", + "displayName": "Password", + "description": "The password to access the JDG Caches. Must be different than username; must not be root, admin, or administrator; must contain at least 8 characters, 1 alphabetic character(s), 1 digit(s), and 1 non-alphanumeric symbol(s). (optional)", "name": "PASSWORD", "value": "", "required": false }, { + "displayName": "Server Keystore Secret Name", "description": "The name of the secret containing the keystore file", "name": "HTTPS_SECRET", "value": "datagrid-app-secret", "required": true }, { + "displayName": "Server Keystore Filename", "description": "The name of the keystore file within the secret", "name": "HTTPS_KEYSTORE", "value": "keystore.jks", "required": false }, { + "displayName": "Server Certificate Name", "description": "The name associated with the server certificate", "name": "HTTPS_NAME", "value": "", "required": false }, { + "displayName": "Server Keystore Password", "description": "The password for the keystore and certificate", "name": "HTTPS_PASSWORD", "value": "", "required": false }, { + "displayName": "Database JNDI Name", "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", "name": "DB_JNDI", "value": "java:jboss/datasources/postgresql", "required": false }, { + "displayName": "Database Name", "description": "Database name", "name": "DB_DATABASE", "value": "root", "required": true }, { + "displayName": "Database Username", "description": "Database user name", "name": "DB_USERNAME", "from": "user[a-zA-Z0-9]{3}", @@ -89,6 +103,7 @@ "required": true }, { + "displayName": "Database Password", "description": "Database user password", "name": "DB_PASSWORD", "from": "[a-zA-Z0-9]{8}", @@ -96,102 +111,140 @@ "required": true }, { + "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", "name": "DB_MIN_POOL_SIZE", "required": false }, { + "displayName": "Datasource Maximum Pool Size", "description": "Sets xa-pool/max-pool-size for the configured datasource.", "name": "DB_MAX_POOL_SIZE", "required": false }, { + "displayName": "Datasource Transaction Isolation", "description": "Sets transaction-isolation for the configured datasource.", "name": "DB_TX_ISOLATION", "required": false }, { + "displayName": "PostgreSQL Maximum number of connections", "description": "The maximum number of client connections allowed. This also sets the maximum number of prepared transactions.", "name": "POSTGRESQL_MAX_CONNECTIONS", "required": false }, { + "displayName": "PostgreSQL Shared Buffers", "description": "Configures how much memory is dedicated to PostgreSQL for caching data.", "name": "POSTGRESQL_SHARED_BUFFERS", "required": false }, { + "displayName": "Database Volume Capacity", "description": "Size of persistent storage for database volume.", "name": "VOLUME_CAPACITY", "value": "512Mi", "required": true }, { + "displayName": "ImageStream Namespace", "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", "name": "IMAGE_STREAM_NAMESPACE", "value": "openshift", "required": true }, { + "displayName": "Infinispan Connectors", "description": "Comma-separated list of connector types that should be configured (defaults to 'memcached,hotrod,rest')", "name": "INFINISPAN_CONNECTORS", "value": "hotrod,memcached,rest", "required": false }, { + "displayName": "Cache Names", "description": "Comma-separated list of caches to configure. By default, a distributed-cache, with a mode of SYNC will be configured for each entry.", "name": "CACHE_NAMES", "value": "", "required": false }, { + "displayName": "Datavirt Cache Names", + "description": "Comma-separated list of caches to configure for use by Red Hat JBoss Data Virtualization for materialization of views. Three caches will be created for each named cache: <name>, <name>_staging and <name>_alias.", + "name": "DATAVIRT_CACHE_NAMES", + "value": "", + "required": false + }, + { + "displayName": "Default Cache Type", + "description": "Default cache type for all caches. If empty then distributed will be the default", + "name": "CACHE_TYPE_DEFAULT", + "value": "", + "required": false + }, + { + "displayName": "Encryption Requires SSL Client Authentication?", "description": "", "name": "ENCRYPTION_REQUIRE_SSL_CLIENT_AUTH", "value": "", "required": false }, { + "displayName": "Memcached Cache Name", "description": "The name of the cache to expose through this memcached connector (defaults to 'default')", "name": "MEMCACHED_CACHE", "value": "default", "required": false }, { + "displayName": "REST Security Domain", "description": "The domain, declared in the security subsystem, that should be used to authenticate access to the REST endpoint", "name": "REST_SECURITY_DOMAIN", "value": "", "required": false }, { + "displayName": "JGroups Secret Name", "description": "The name of the secret containing the keystore file", "name": "JGROUPS_ENCRYPT_SECRET", "value": "datagrid-app-secret", "required": false }, { + "displayName": "JGroups Keystore Filename", "description": "The name of the keystore file within the secret", "name": "JGROUPS_ENCRYPT_KEYSTORE", "value": "jgroups.jceks", "required": false }, { + "displayName": "JGroups Certificate Name", "description": "The name associated with the server certificate", "name": "JGROUPS_ENCRYPT_NAME", "value": "", "required": false }, { + "displayName": "JGroups Keystore Password", "description": "The password for the keystore and certificate", "name": "JGROUPS_ENCRYPT_PASSWORD", "value": "", "required": false }, { + "displayName": "JGroups Cluster Password", "description": "JGroups cluster password", "name": "JGROUPS_CLUSTER_PASSWORD", "from": "[a-zA-Z0-9]{8}", "generate": "expression", "required": true + }, + { + "displayName": "PostgreSQL Image Stream Tag", + "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", + "name": "POSTGRESQL_IMAGE_STREAM_TAG", + "value": "9.5", + "required": true } ], "objects": [ @@ -215,7 +268,8 @@ "application": "${APPLICATION_NAME}" }, "annotations": { - "description": "The web server's HTTP port." + "description": "The web server's HTTP port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" } } }, @@ -239,7 +293,8 @@ "application": "${APPLICATION_NAME}" }, "annotations": { - "description": "The web server's HTTPS port." + "description": "The web server's HTTPS port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" } } }, @@ -382,7 +437,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "jboss-datagrid65-openshift:1.2" + "name": "jboss-datagrid65-openshift:1.4" } } }, @@ -467,9 +522,14 @@ "protocol": "TCP" }, { - "name": "hotrod", + "name": "hotrod-internal", "containerPort": 11222, "protocol": "TCP" + }, + { + "name": "hotrod", + "containerPort": 11333, + "protocol": "TCP" } ], "env": [ @@ -570,6 +630,14 @@ "value": "${CACHE_NAMES}" }, { + "name": "DATAVIRT_CACHE_NAMES", + "value": "${DATAVIRT_CACHE_NAMES}" + }, + { + "name": "CACHE_TYPE_DEFAULT", + "value": "${CACHE_TYPE_DEFAULT}" + }, + { "name": "ENCRYPTION_REQUIRE_SSL_CLIENT_AUTH", "value": "${ENCRYPTION_REQUIRE_SSL_CLIENT_AUTH}" }, @@ -654,7 +722,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "postgresql:latest" + "name": "postgresql:${POSTGRESQL_IMAGE_STREAM_TAG}" } } }, |