diff options
author | Scott Dodson <sdodson@redhat.com> | 2015-06-28 15:07:27 -0400 |
---|---|---|
committer | Scott Dodson <sdodson@redhat.com> | 2015-06-29 17:03:07 -0400 |
commit | 06eafb491996ec592f303d03e28bd02fee559f85 (patch) | |
tree | 5c2ecc673044efafefa47c9ae0a69b8f3f8bcb68 /roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json | |
parent | 0bd9aa5e06febf45030743d7322e66c850d0b290 (diff) | |
download | openshift-06eafb491996ec592f303d03e28bd02fee559f85.tar.gz openshift-06eafb491996ec592f303d03e28bd02fee559f85.tar.bz2 openshift-06eafb491996ec592f303d03e28bd02fee559f85.tar.xz openshift-06eafb491996ec592f303d03e28bd02fee559f85.zip |
Sync xpaas examples with github
Diffstat (limited to 'roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json')
-rw-r--r-- | roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json b/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json index 2a9c06bee..0790d6546 100644 --- a/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json +++ b/roles/openshift_examples/files/examples/xpaas-templates/eap6-amq-persistent-sti.json @@ -28,9 +28,9 @@ "value": "eap-app" }, { - "description": "Hostname for service routes", + "description": "Custom hostname for service routes. Leave blank for default hostname, e.g.: <application-name>.<project>.<default-domain-suffix>", "name": "APPLICATION_HOSTNAME", - "value": "eap-app.local" + "value": "" }, { "description": "Git source URI for application", @@ -144,7 +144,7 @@ } }, "metadata": { - "name": "${APPLICATION_NAME}-http-service", + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" }, @@ -168,7 +168,7 @@ } }, "metadata": { - "name": "${APPLICATION_NAME}-https-service", + "name": "secure-${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" }, @@ -242,7 +242,7 @@ "spec": { "host": "${APPLICATION_HOSTNAME}", "to": { - "name": "${APPLICATION_NAME}-http-service" + "name": "${APPLICATION_NAME}" } } }, @@ -262,7 +262,7 @@ "spec": { "host": "${APPLICATION_HOSTNAME}", "to": { - "name": "${APPLICATION_NAME}-https-service" + "name": "secure-${APPLICATION_NAME}" }, "tls": { "termination" : "passthrough" @@ -302,6 +302,7 @@ "sourceStrategy": { "from": { "kind": "ImageStreamTag", + "namespace": "openshift", "name": "jboss-eap6-openshift:${EAP_RELEASE}" } } @@ -502,6 +503,7 @@ ], "from": { "kind": "ImageStreamTag", + "namespace": "openshift", "name": "jboss-amq-6:${AMQ_RELEASE}" } } @@ -523,7 +525,7 @@ "containers": [ { "name": "${APPLICATION_NAME}-amq", - "image": "registry.access.redhat.com/jboss-amq-6/amq-openshift:${AMQ_RELEASE}", + "image": "jboss-amq-6", "imagePullPolicy": "Always", "readinessProbe": { "exec": { |