[CORD-3022] Splitting config in RCORD services
Change-Id: I66ea8470a5e25942c6460dfc75b21328baca3415
diff --git a/xos-services/fabric/templates/_helpers.tpl b/xos-services/fabric/templates/_helpers.tpl
index 775d2c2..b8888e9 100644
--- a/xos-services/fabric/templates/_helpers.tpl
+++ b/xos-services/fabric/templates/_helpers.tpl
@@ -52,14 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - Instance
- - Tag
- - FabricService
-dependency_graph: "/opt/xos/synchronizers/fabric/model-deps"
-steps_dir: "/opt/xos/synchronizers/fabric/steps"
-sys_dir: "/opt/xos/synchronizers/fabric/sys"
-models_dir: "/opt/xos/synchronizers/fabric/models"
logging:
version: 1
handlers:
diff --git a/xos-services/fabric/templates/deployment.yaml b/xos-services/fabric/templates/deployment.yaml
index 3c7d03b..be332e0 100644
--- a/xos-services/fabric/templates/deployment.yaml
+++ b/xos-services/fabric/templates/deployment.yaml
@@ -45,8 +45,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: fabric-config
- mountPath: /opt/xos/synchronizers/fabric/fabric_config.yaml
- subPath: fabric_config.yaml
+ mountPath: /opt/xos/synchronizers/fabric/mounted_config.yaml
+ subPath: mounted_config.yaml
- name: certchain-volume
mountPath: /usr/local/share/ca-certificates/local_certs.crt
subPath: config/ca_cert_chain.pem
@@ -56,7 +56,7 @@
name: fabric
items:
- key: serviceConfig
- path: fabric_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/onos-service/templates/_helpers.tpl b/xos-services/onos-service/templates/_helpers.tpl
index 5c59ebc..b93ce55 100644
--- a/xos-services/onos-service/templates/_helpers.tpl
+++ b/xos-services/onos-service/templates/_helpers.tpl
@@ -53,13 +53,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - ONOSService
- - ONOSApp
-dependency_graph: "/opt/xos/synchronizers/onos/model-deps"
-steps_dir: "/opt/xos/synchronizers/onos/steps"
-sys_dir: "/opt/xos/synchronizers/onos/sys"
-models_dir: "/opt/xos/synchronizers/onos/models"
logging:
version: 1
handlers:
diff --git a/xos-services/onos-service/templates/deployment.yaml b/xos-services/onos-service/templates/deployment.yaml
index 38b66b2..4741338 100644
--- a/xos-services/onos-service/templates/deployment.yaml
+++ b/xos-services/onos-service/templates/deployment.yaml
@@ -44,8 +44,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: onos-service-config
- mountPath: /opt/xos/synchronizers/onos/onos_config.yaml
- subPath: onos_config.yaml
+ mountPath: /opt/xos/synchronizers/onos/mounted_config.yaml
+ subPath: mounted_config.yaml
- name: certchain-volume
mountPath: /usr/local/share/ca-certificates/local_certs.crt
subPath: config/ca_cert_chain.pem
@@ -55,7 +55,7 @@
name: onos-service
items:
- key: serviceConfig
- path: onos_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/rcord/templates/_helpers.tpl b/xos-services/rcord/templates/_helpers.tpl
index 938446d..d9b69b6 100644
--- a/xos-services/rcord/templates/_helpers.tpl
+++ b/xos-services/rcord/templates/_helpers.tpl
@@ -48,11 +48,20 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - RCORDService
- - RCORDSubscriber
-dependency_graph: "/opt/xos/synchronizers/rcord/model-deps"
-sys_dir: "/opt/xos/synchronizers/rcord/sys"
-models_dir: "/opt/xos/synchronizers/rcord/models"
-model_policies_dir: "/opt/xos/synchronizers/rcord/model_policies"
+logging:
+ version: 1
+ handlers:
+ console:
+ class: logging.StreamHandler
+ file:
+ class: logging.handlers.RotatingFileHandler
+ filename: /var/log/xos.log
+ maxBytes: 10485760
+ backupCount: 5
+ loggers:
+ 'multistructlog':
+ handlers:
+ - console
+ - file
+ level: DEBUG
{{- end -}}
diff --git a/xos-services/rcord/templates/deployment.yaml b/xos-services/rcord/templates/deployment.yaml
index e99e565..0233fc4 100644
--- a/xos-services/rcord/templates/deployment.yaml
+++ b/xos-services/rcord/templates/deployment.yaml
@@ -45,8 +45,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: rcord-config
- mountPath: /opt/xos/synchronizers/rcord/rcord_config.yaml
- subPath: rcord_config.yaml
+ mountPath: /opt/xos/synchronizers/rcord/mounted_config.yaml
+ subPath: mounted_config.yaml
- name: certchain-volume
mountPath: /usr/local/share/ca-certificates/local_certs.crt
subPath: config/ca_cert_chain.pem
@@ -56,7 +56,7 @@
name: rcord
items:
- key: serviceConfig
- path: rcord_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/volt/templates/_helpers.tpl b/xos-services/volt/templates/_helpers.tpl
index bbf2a38..36706ed 100644
--- a/xos-services/volt/templates/_helpers.tpl
+++ b/xos-services/volt/templates/_helpers.tpl
@@ -55,17 +55,6 @@
event_bus:
endpoint: cord-kafka-kafka
kind: kafka
-required_models:
- - VOLTService
- - VOLTServiceInstance
- - ServiceInstanceLink
- - OLTDevice
-dependency_graph: "/opt/xos/synchronizers/volt/model-deps"
-model_policies_dir: "/opt/xos/synchronizers/volt/model_policies"
-models_dir: "/opt/xos/synchronizers/volt/models"
-steps_dir: "/opt/xos/synchronizers/volt/steps"
-pull_steps_dir: "/opt/xos/synchronizers/volt/pull_steps"
-event_steps_dir: "/opt/xos/synchronizers/volt/event_steps"
logging:
version: 1
handlers:
diff --git a/xos-services/volt/templates/deployment.yaml b/xos-services/volt/templates/deployment.yaml
index f285b6d..cb04c03 100644
--- a/xos-services/volt/templates/deployment.yaml
+++ b/xos-services/volt/templates/deployment.yaml
@@ -45,8 +45,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: volt-config
- mountPath: /opt/xos/synchronizers/volt/volt_config.yaml
- subPath: volt_config.yaml
+ mountPath: /opt/xos/synchronizers/volt/mounted_config.yaml
+ subPath: mounted_config.yaml
- name: certchain-volume
mountPath: /usr/local/share/ca-certificates/local_certs.crt
subPath: config/ca_cert_chain.pem
@@ -56,7 +56,7 @@
name: volt
items:
- key: serviceConfig
- path: volt_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/vrouter/templates/_helpers.tpl b/xos-services/vrouter/templates/_helpers.tpl
index b5a307c..0a26cd1 100644
--- a/xos-services/vrouter/templates/_helpers.tpl
+++ b/xos-services/vrouter/templates/_helpers.tpl
@@ -52,14 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - VRouterService
- - VRouterServiceInstance
- - VRouterStaticRoute
-dependency_graph: "/opt/xos/synchronizers/vrouter/model-deps"
-steps_dir: "/opt/xos/synchronizers/vrouter/steps"
-sys_dir: "/opt/xos/synchronizers/vrouter/sys"
-models_dir: "/opt/xos/synchronizers/vrouter/models"
logging:
version: 1
handlers:
diff --git a/xos-services/vrouter/templates/deployment.yaml b/xos-services/vrouter/templates/deployment.yaml
index 524225d..8c3eba3 100644
--- a/xos-services/vrouter/templates/deployment.yaml
+++ b/xos-services/vrouter/templates/deployment.yaml
@@ -45,8 +45,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: vrouter-config
- mountPath: /opt/xos/synchronizers/vrouter/vrouter_config.yaml
- subPath: vrouter_config.yaml
+ mountPath: /opt/xos/synchronizers/vrouter/mounted_config.yaml
+ subPath: mounted_config.yaml
- name: certchain-volume
mountPath: /usr/local/share/ca-certificates/local_certs.crt
subPath: config/ca_cert_chain.pem
@@ -56,7 +56,7 @@
name: vrouter
items:
- key: serviceConfig
- path: vrouter_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/vsg-hw/templates/_helpers.tpl b/xos-services/vsg-hw/templates/_helpers.tpl
index 3970829..fcf95f9 100644
--- a/xos-services/vsg-hw/templates/_helpers.tpl
+++ b/xos-services/vsg-hw/templates/_helpers.tpl
@@ -52,15 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - VSGHWService
- - VSGHWServiceInstance
- - ServiceInstanceLink
-dependency_graph: "/opt/xos/synchronizers/vsg-hw/model-deps"
-steps_dir: "/opt/xos/synchronizers/vsg-hw/steps"
-model_policies_dir: "/opt/xos/synchronizers/vsg-hw/model_policies"
-sys_dir: "/opt/xos/synchronizers/vsg-hw/sys"
-models_dir: "/opt/xos/synchronizers/vsg-hw/models"
logging:
version: 1
handlers:
diff --git a/xos-services/vsg-hw/templates/deployment.yaml b/xos-services/vsg-hw/templates/deployment.yaml
index 17b129b..d81cc16 100644
--- a/xos-services/vsg-hw/templates/deployment.yaml
+++ b/xos-services/vsg-hw/templates/deployment.yaml
@@ -45,8 +45,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: vsg-hw-config
- mountPath: /opt/xos/synchronizers/vsg-hw/vsg_hw_config.yaml
- subPath: vsg_hw_config.yaml
+ mountPath: /opt/xos/synchronizers/vsg-hw/mounted_config.yaml
+ subPath: mounted_config.yaml
- name: certchain-volume
mountPath: /usr/local/share/ca-certificates/local_certs.crt
subPath: config/ca_cert_chain.pem
@@ -56,7 +56,7 @@
name: vsg-hw
items:
- key: serviceConfig
- path: vsg_hw_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates