summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v3.7/xpaas-templates/amq63-persistent.json
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_examples/files/examples/v3.7/xpaas-templates/amq63-persistent.json')
-rw-r--r--roles/openshift_examples/files/examples/v3.7/xpaas-templates/amq63-persistent.json42
1 files changed, 34 insertions, 8 deletions
diff --git a/roles/openshift_examples/files/examples/v3.7/xpaas-templates/amq63-persistent.json b/roles/openshift_examples/files/examples/v3.7/xpaas-templates/amq63-persistent.json
index 7c0aec61a..a87876ca5 100644
--- a/roles/openshift_examples/files/examples/v3.7/xpaas-templates/amq63-persistent.json
+++ b/roles/openshift_examples/files/examples/v3.7/xpaas-templates/amq63-persistent.json
@@ -5,7 +5,7 @@
"annotations": {
"iconClass": "icon-amq",
"tags": "messaging,amq,jboss",
- "version": "1.4.7",
+ "version": "1.4.8",
"openshift.io/display-name": "JBoss A-MQ 6.3 (no SSL)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss A-MQ application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
@@ -17,7 +17,7 @@
},
"labels": {
"template": "amq63-persistent",
- "xpaas": "1.4.7"
+ "xpaas": "1.4.8"
},
"message": "A new persistent messaging service has been created in your project. It will handle the protocol(s) \"${MQ_PROTOCOL}\". The username/password for accessing the service is ${MQ_USERNAME}/${MQ_PASSWORD}.",
"parameters": [
@@ -67,7 +67,7 @@
"displayName": "A-MQ Volume Size",
"description": "Size of the volume used by A-MQ for persisting messages.",
"name": "VOLUME_CAPACITY",
- "value": "512Mi",
+ "value": "1Gi",
"required": true
},
{
@@ -90,7 +90,7 @@
"displayName": "A-MQ Mesh Discovery Type",
"description": "The discovery agent type to use for discovering mesh endpoints. 'dns' will use OpenShift's DNS service to resolve endpoints. 'kube' will use Kubernetes REST API to resolve service endpoints. If using 'kube' the service account for the pod must have the 'view' role, which can be added via 'oc policy add-role-to-user view system:serviceaccount:<namespace>:default' where <namespace> is the project namespace.",
"name": "AMQ_MESH_DISCOVERY_TYPE",
- "value": "kube",
+ "value": "dns",
"required": false
},
{
@@ -214,6 +214,32 @@
}
},
{
+ "kind": "Service",
+ "apiVersion": "v1",
+ "spec": {
+ "clusterIP": "None",
+ "ports": [
+ {
+ "name": "mesh",
+ "port": 61616
+ }
+ ],
+ "selector": {
+ "deploymentConfig": "${APPLICATION_NAME}-amq"
+ }
+ },
+ "metadata": {
+ "name": "${APPLICATION_NAME}-amq-mesh",
+ "labels": {
+ "application": "${APPLICATION_NAME}"
+ },
+ "annotations": {
+ "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",
+ "description": "Supports node discovery for mesh formation."
+ }
+ }
+ },
+ {
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
@@ -240,7 +266,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
- "name": "jboss-amq-63:1.2"
+ "name": "jboss-amq-63:1.3"
}
}
},
@@ -344,7 +370,7 @@
},
{
"name": "AMQ_MESH_SERVICE_NAME",
- "value": "${APPLICATION_NAME}-amq-tcp"
+ "value": "${APPLICATION_NAME}-amq-mesh"
},
{
"name": "AMQ_MESH_SERVICE_NAMESPACE",
@@ -401,7 +427,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
- "name": "jboss-amq-63:1.2"
+ "name": "jboss-amq-63:1.3"
}
}
},
@@ -460,7 +486,7 @@
},
{
"name": "AMQ_MESH_SERVICE_NAME",
- "value": "${APPLICATION_NAME}-amq-tcp"
+ "value": "${APPLICATION_NAME}-amq-mesh"
},
{
"name": "AMQ_MESH_SERVICE_NAMESPACE",