summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v3.8/xpaas-templates/amq62-basic.json
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_examples/files/examples/v3.8/xpaas-templates/amq62-basic.json')
-rw-r--r--roles/openshift_examples/files/examples/v3.8/xpaas-templates/amq62-basic.json36
1 files changed, 31 insertions, 5 deletions
diff --git a/roles/openshift_examples/files/examples/v3.8/xpaas-templates/amq62-basic.json b/roles/openshift_examples/files/examples/v3.8/xpaas-templates/amq62-basic.json
index 8f8e14cb6..134a577b6 100644
--- a/roles/openshift_examples/files/examples/v3.8/xpaas-templates/amq62-basic.json
+++ b/roles/openshift_examples/files/examples/v3.8/xpaas-templates/amq62-basic.json
@@ -7,14 +7,14 @@
"iconClass": "icon-amq",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"tags": "messaging,amq,jboss,hidden",
- "version": "1.4.7",
+ "version": "1.4.8",
"openshift.io/display-name": "JBoss A-MQ 6.2 (Ephemeral, no SSL)"
},
"name": "amq62-basic"
},
"labels": {
"template": "amq62-basic",
- "xpaas": "1.4.7"
+ "xpaas": "1.4.8"
},
"message": "A new 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": [
@@ -73,7 +73,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
},
{
@@ -197,6 +197,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": {
@@ -223,7 +249,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
- "name": "jboss-amq-62:1.6"
+ "name": "jboss-amq-62:1.7"
}
}
},
@@ -317,7 +343,7 @@
},
{
"name": "AMQ_MESH_SERVICE_NAME",
- "value": "${APPLICATION_NAME}-amq-tcp"
+ "value": "${APPLICATION_NAME}-amq-mesh"
},
{
"name": "AMQ_MESH_SERVICE_NAMESPACE",