| commit | 2988d52e0eb2b2c9937d8285dfa91be8c9da715c | [log] [tgz] |
|---|---|---|
| author | Andy Bavier <andy@opennetworking.org> | Mon Jun 18 23:09:00 2018 +0000 |
| committer | Gerrit Code Review <gerrit@opencord.org> | Mon Jun 18 23:09:00 2018 +0000 |
| tree | 2dba9ac8b6ca216fb2560cad09f54dea0ffa87bf | |
| parent | f560135fe6969021f4b22d8bca67e71e0d8de92e [diff] | |
| parent | 5dd3d926aa6a1fb1cd05b9bc806879cb27aa14e1 [diff] |
Merge "CORD-3158 Consistent ImagePullPolicy"
diff --git a/xos-services/hippie-oss/templates/_helpers.tpl b/xos-services/hippie-oss/templates/_helpers.tpl index f395a0c..47695c7 100644 --- a/xos-services/hippie-oss/templates/_helpers.tpl +++ b/xos-services/hippie-oss/templates/_helpers.tpl
@@ -52,9 +52,6 @@ username: {{ .Values.xosAdminUser | quote }} password: {{ .Values.xosAdminPassword | quote }} endpoint: xos-core:50051 -event_bus: - endpoint: cord-kafka-kafka - kind: kafka required_models: - HippieOSSService - HippieOSSServiceInstance
diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl index fc02c63..ddffea6 100644 --- a/xos-services/onos-service/templates/_tosca.tpl +++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -186,7 +186,7 @@ value: > { "kafka" : { - "bootstrapServers" : "cord-kafka-kafka.default.svc.cluster.local:9092" + "bootstrapServers" : "cord-kafka.default.svc.cluster.local:9092" } } requirements:
diff --git a/xos-services/simpleexampleservice/templates/_helpers.tpl b/xos-services/simpleexampleservice/templates/_helpers.tpl index f5f7a4f..d1fb889 100644 --- a/xos-services/simpleexampleservice/templates/_helpers.tpl +++ b/xos-services/simpleexampleservice/templates/_helpers.tpl
@@ -53,7 +53,7 @@ password: {{ .Values.xosAdminPassword | quote }} endpoint: xos-core:50051 event_bus: - endpoint: cord-kafka-kafka + endpoint: cord-kafka kind: kafka required_models: - SimpleExampleService
diff --git a/xos-services/volt/templates/_helpers.tpl b/xos-services/volt/templates/_helpers.tpl index 36706ed..a19e6f7 100644 --- a/xos-services/volt/templates/_helpers.tpl +++ b/xos-services/volt/templates/_helpers.tpl
@@ -53,7 +53,7 @@ password: {{ .Values.xosAdminPassword | quote }} endpoint: xos-core:50051 event_bus: - endpoint: cord-kafka-kafka + endpoint: cord-kafka kind: kafka logging: version: 1