XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I6dc4bd70fcaf230d019dda871c2d8c4cfb92c7e7
diff --git a/xos-services/openstack/templates/_helpers.tpl b/xos-services/openstack/templates/_helpers.tpl
index 7a5e6d4..fdca6e8 100644
--- a/xos-services/openstack/templates/_helpers.tpl
+++ b/xos-services/openstack/templates/_helpers.tpl
@@ -57,11 +57,17 @@
filename: /var/log/xos.log
maxBytes: 10485760
backupCount: 5
+ kafka:
+ class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
+ bootstrap_servers:
+ - "cord-kafka:9092"
+ topic: xos.log.openstack
loggers:
'multistructlog':
handlers:
- console
- file
+ - kafka
level: DEBUG
nova:
ca_ssl_cert: "/etc/ssl/certs/ca-certificates.crt"
diff --git a/xos-services/openstack/templates/deployment.yaml b/xos-services/openstack/templates/deployment.yaml
index 6b985f5..0e94850 100644
--- a/xos-services/openstack/templates/deployment.yaml
+++ b/xos-services/openstack/templates/deployment.yaml
@@ -39,8 +39,8 @@
spec:
containers:
- name: {{ .Chart.Name }}
- image: {{ tpl .Values.openstack_synchronizerImage . | quote }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
{{ toYaml .Values.resources | indent 12 }}
volumeMounts: