XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I6dc4bd70fcaf230d019dda871c2d8c4cfb92c7e7
diff --git a/xos-services/openstack/Chart.yaml b/xos-services/openstack/Chart.yaml
index bd187f7..e5d299f 100644
--- a/xos-services/openstack/Chart.yaml
+++ b/xos-services/openstack/Chart.yaml
@@ -15,4 +15,5 @@
name: openstack
description: A Helm chart for XOS's "openstack" service
-version: 1.0.0
+version: 1.0.1
+appVersion: 1.0.1
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:
diff --git a/xos-services/openstack/values.yaml b/xos-services/openstack/values.yaml
index bf45148..e619da0 100644
--- a/xos-services/openstack/values.yaml
+++ b/xos-services/openstack/values.yaml
@@ -24,7 +24,13 @@
imagePullPolicy: 'Always'
-openstack_synchronizerImage: "xosproject/openstack-synchronizer:{{ .Chart.Version }}"
+image:
+ repository: xosproject/openstack-synchronizer
+ tag: "{{ .Chart.AppVersion }}"
+ pullPolicy: Always
+
+global:
+ registry: ""
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"