aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2018-04-11 10:01:28 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-11 10:01:28 +0000
commitcea11404ceab47521bffbfd02827e1e127b96aa8 (patch)
tree237bfe58ba58efdac1fac60077486a9e42411152
parentcfd33a3cd3b4b1773bb3ce89f92a833c5770b433 (diff)
parent272bf6cbdbbf2abef05fdf84af55eca847e99524 (diff)
Merge "include env for k8s deployment"
-rw-r--r--blueprints/k8s-tca.yaml-template36
1 files changed, 26 insertions, 10 deletions
diff --git a/blueprints/k8s-tca.yaml-template b/blueprints/k8s-tca.yaml-template
index 93c71fb..a6654ce 100644
--- a/blueprints/k8s-tca.yaml-template
+++ b/blueprints/k8s-tca.yaml-template
@@ -16,7 +16,6 @@
# limitations under the License.
# ============LICENSE_END======================================================
-
tosca_definitions_version: cloudify_dsl_1_3
description: >
@@ -29,15 +28,19 @@ imports:
inputs:
aaiEnrichmentHost:
type: string
+ default: "none"
+ aaiEnrichmentPort:
+ type: string
+ default: 8443
enableAAIEnrichment:
type: string
default: false
dmaap_host:
type: string
- default: dmaap.onap-message-router
+ default: dmaap.onap-message-router
dmaap_port:
type: string
- default: 3904
+ default: 3904
enableRedisCaching:
type: string
redisHosts:
@@ -64,7 +67,7 @@ inputs:
type: string
description: Kubernetes node port on which CDAPgui is exposed
default: "32010"
-
+
node_templates:
tca_k8s:
type: dcae.nodes.ContainerizedServiceComponent
@@ -137,12 +140,25 @@ node_templates:
start:
inputs:
envs:
- DMAAPHOST: { get_input: dmaap_host }
- CONSUL_HOST: { get_input: consul_host }
- CONSUL_PORT: { get_input: consul_port }
- CBS_HOST: { get_input: cbs_host }
- CBS_PORT: { get_input: cbs_port }
- CONFIG_BINDING_SERVICE: "config_binding_service"
+ DMAAPHOST:
+ { get_input: dmaap_host }
+ DMAAPPORT:
+ { get_input: dmaap_port }
+ DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT"
+ DMAAPSUBTOPIC: "unauthenticated.SEC_MEASUREMENT_OUTPUT"
+ AAIHOST:
+ { get_input: aaiEnrichmentHost }
+ AAIPORT:
+ { get_input: aaiEnrichmentPort }
+ CONSUL_HOST:
+ { get_input: consul_host }
+ CONSUL_PORT:
+ { get_input: consul_port }
+ CBS_HOST:
+ { get_input: cbs_host }
+ CBS_PORT:
+ { get_input: cbs_port }
+ CONFIG_BINDING_SERVICE: "config_binding_service"
ports:
- concat: ["11011:", { get_input: external_port }]
tca_policy: