Merge "[CORD-3022] Splitting config in MCORD services"
diff --git a/xos-services/epc-service/templates/_helpers.tpl b/xos-services/epc-service/templates/_helpers.tpl
index b8ecab8..f5ea4c8 100644
--- a/xos-services/epc-service/templates/_helpers.tpl
+++ b/xos-services/epc-service/templates/_helpers.tpl
@@ -52,14 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - VEPCService
- - VEPCServiceInstance
-dependency_graph: "/opt/xos/synchronizers/epc-service/model-deps"
-# steps_dir: "/opt/xos/synchronizers/epc-service/steps"
-sys_dir: "/opt/xos/synchronizers/epc-service/sys"
-model_policies_dir: "/opt/xos/synchronizers/epc-service/model_policies"
-models_dir: "/opt/xos/synchronizers/epc-service/models"
logging:
version: 1
handlers:
@@ -76,192 +68,5 @@
- console
- file
level: DEBUG
-blueprints:
- - name: build
- networks:
- - name: s1u_network
- subnet: 111.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vspgwu
- - name: s11_network
- subnet: 112.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vspgwc
- - name: sgi_network
- subnet: 115.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vspgwu
- - name: spgw_network
- subnet: 117.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vspgwu
- graph:
- - name: VSPGWUTenant
- networks:
- - management
- - s1u_network
- - sgi_network
- - spgw_network
- links:
- - name: VENBServiceInstance
- node_label: gwu-enb
- networks:
- - s1u_network
- - sgi_network
- - name: VENBServiceInstance
- networks:
- - management
- - s1u_network
- - sgi_network
- - s11_network
- - name: VSPGWCTenant
- networks:
- - management
- - s11_network
- - spgw_network
- links:
- - name: VENBServiceInstance
- networks:
- - s11_network
- - name: VSPGWUTenant
- networks:
- - spgw_network
- - name: mcord_5
- networks:
- - name: flat_network_s1u
- subnet: 119.0.0.0/24
- permit_all_slices: True
- template: flat_template
- owner: vspgwu
- - name: flat_network_s1mme
- subnet: 118.0.0.0/24
- permit_all_slices: True
- template: flat_template
- owner: vmme
- - name: s11_network
- subnet: 112.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vspgwc
- - name: sgi_network
- subnet: 115.0.0.0/24
- permit_all_slices: True
- owner: vspgwu
- template: private_template
- - name: spgw_network
- subnet: 117.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vspgwu
- - name: s6a_network
- subnet: 120.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vhss
- - name: db_network
- subnet: 121.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vhss
- graph:
- - name: VMMETenant
- networks:
- - management
- - flat_network_s1mme
- - s11_network
- - s6a_network
- links:
- - name: VHSSTenant
- networks:
- - s6a_network
- - name: VSPGWCTenant
- networks:
- - management
- - s11_network
- - spgw_network
- links:
- - name: VMMETenant
- networks:
- - s11_network
- - name: VSPGWUTenant
- networks:
- - spgw_network
- - name: VSPGWUTenant
- networks:
- - management
- - flat_network_s1u
- - sgi_network
- - spgw_network
- - name: VHSSTenant
- networks:
- - management
- - s6a_network
- - db_network
- links:
- - name: HSSDBServiceInstance
- networks:
- - db_network
- - name: HSSDBServiceInstance
- networks:
- - management
- - db_network
- - name: mcord_5_p4
- networks:
- - name: flat_network_s1mme
- subnet: 118.0.0.0/24
- permit_all_slices: True
- template: flat_template
- owner: vmme
- - name: s11_network
- subnet: 112.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vspgwc
- - name: s6a_network
- subnet: 120.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vhss
- - name: db_network
- subnet: 121.0.0.0/24
- permit_all_slices: True
- template: private_template
- owner: vhss
- graph:
- - name: VMMETenant
- networks:
- - management
- - flat_network_s1mme
- - s11_network
- - s6a_network
- links:
- - name: VHSSTenant
- networks:
- - s6a_network
- - name: VSPGWCTenant
- networks:
- - management
- - s11_network
- links:
- - name: VMMETenant
- networks:
- - s11_network
- - name: VHSSTenant
- networks:
- - management
- - s6a_network
- - db_network
- links:
- - name: HSSDBServiceInstance
- networks:
- - db_network
- - name: HSSDBServiceInstance
- networks:
- - management
- - db_network
{{- end -}}
diff --git a/xos-services/epc-service/templates/deployment.yaml b/xos-services/epc-service/templates/deployment.yaml
index 46a68d7..1a0ddcd 100644
--- a/xos-services/epc-service/templates/deployment.yaml
+++ b/xos-services/epc-service/templates/deployment.yaml
@@ -44,8 +44,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: epc-service-config
- mountPath: /opt/xos/synchronizers/epc-service/vepc_config.yaml
- subPath: vepc_config.yaml
+ mountPath: /opt/xos/synchronizers/epc-service/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: epc-service
items:
- key: serviceConfig
- path: vepc_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/hssdb/templates/_helpers.tpl b/xos-services/hssdb/templates/_helpers.tpl
index 2ac6d58..ba1517e 100644
--- a/xos-services/hssdb/templates/_helpers.tpl
+++ b/xos-services/hssdb/templates/_helpers.tpl
@@ -52,15 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - HSSDBService
- - HSSDBVendor
- - HSSDBServiceInstance
-dependency_graph: "/opt/xos/synchronizers/hssdb/model-deps"
-steps_dir: "/opt/xos/synchronizers/hssdb/steps"
-sys_dir: "/opt/xos/synchronizers/hssdb/sys"
-model_policies_dir: "/opt/xos/synchronizers/hssdb/model_policies"
-models_dir: "/opt/xos/synchronizers/hssdb/models"
logging:
version: 1
handlers:
diff --git a/xos-services/hssdb/templates/deployment.yaml b/xos-services/hssdb/templates/deployment.yaml
index 9b4511d..1e8489c 100644
--- a/xos-services/hssdb/templates/deployment.yaml
+++ b/xos-services/hssdb/templates/deployment.yaml
@@ -44,8 +44,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: hssdb-config
- mountPath: /opt/xos/synchronizers/hssdb/hssdb_config.yaml
- subPath: hssdb_config.yaml
+ mountPath: /opt/xos/synchronizers/hssdb/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
@@ -61,7 +61,7 @@
name: hssdb
items:
- key: serviceConfig
- path: hssdb_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/internetemulator/templates/_helpers.tpl b/xos-services/internetemulator/templates/_helpers.tpl
index 9539cf5..d6e6310 100644
--- a/xos-services/internetemulator/templates/_helpers.tpl
+++ b/xos-services/internetemulator/templates/_helpers.tpl
@@ -52,15 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - InternetEmulatorService
- - InternetEmulatorServiceInstance
- - ServiceDependency
-dependency_graph: "/opt/xos/synchronizers/internetemulator/model-deps"
-steps_dir: "/opt/xos/synchronizers/internetemulator/steps"
-sys_dir: "/opt/xos/synchronizers/internetemulator/sys"
-model_policies_dir: "/opt/xos/synchronizers/internetemulator/model_policies"
-models_dir: "/opt/xos/synchronizers/internetemulator/models"
logging:
version: 1
handlers:
diff --git a/xos-services/internetemulator/templates/deployment.yaml b/xos-services/internetemulator/templates/deployment.yaml
index dde880b..1377a16 100644
--- a/xos-services/internetemulator/templates/deployment.yaml
+++ b/xos-services/internetemulator/templates/deployment.yaml
@@ -44,8 +44,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: internetemulator-config
- mountPath: /opt/xos/synchronizers/internetemulator/internetemulator_config.yaml
- subPath: internetemulator_config.yaml
+ mountPath: /opt/xos/synchronizers/internetemulator/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
@@ -61,7 +61,7 @@
name: internetemulator
items:
- key: serviceConfig
- path: internetemulator_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/mcord-subscriber/templates/_helpers.tpl b/xos-services/mcord-subscriber/templates/_helpers.tpl
index 654f91a..456e27f 100644
--- a/xos-services/mcord-subscriber/templates/_helpers.tpl
+++ b/xos-services/mcord-subscriber/templates/_helpers.tpl
@@ -52,9 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-dependency_graph: "/opt/xos/synchronizers/mcord/model-deps"
-sys_dir: "/opt/xos/synchronizers/mcord/sys"
-models_dir: "/opt/xos/synchronizers/mcord/models"
logging:
version: 1
handlers:
diff --git a/xos-services/mcord-subscriber/templates/job.yaml b/xos-services/mcord-subscriber/templates/job.yaml
index a6ee4e9..8e24663 100644
--- a/xos-services/mcord-subscriber/templates/job.yaml
+++ b/xos-services/mcord-subscriber/templates/job.yaml
@@ -40,8 +40,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: mcord-subscriber-config
- mountPath: /opt/xos/synchronizers/mcord/mcord_config.yaml
- subPath: mcord_config.yaml
+ mountPath: /opt/xos/synchronizers/mcord/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
@@ -51,7 +51,7 @@
name: mcord-subscriber
items:
- key: serviceConfig
- path: mcord_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/openstack/templates/_helpers.tpl b/xos-services/openstack/templates/_helpers.tpl
index 977d1b2..e521645 100644
--- a/xos-services/openstack/templates/_helpers.tpl
+++ b/xos-services/openstack/templates/_helpers.tpl
@@ -47,12 +47,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-dependency_graph: "/opt/xos/synchronizers/openstack/model-deps"
-steps_dir: "/opt/xos/synchronizers/openstack/steps"
-pull_steps_dir: "/opt/xos/synchronizers/openstack/pull_steps"
-sys_dir: "/opt/xos/synchronizers/openstack/sys"
-model_policies_dir: "/opt/xos/synchronizers/openstack/model_policies"
-models_dir: "/opt/xos/synchronizers/openstack/models"
logging:
version: 1
handlers:
@@ -69,20 +63,6 @@
- console
- file
level: DEBUG
-images_directory: "/opt/xos/images"
-required_models:
- - ControllerImages
- - ControllerNetwork
- - ControllerSitePrivilege
- - ControllerSite
- - ControllerSlicePrivilege
- - ControllerSlice
- - ControllerUser
- - Image
- - Instance
- - Port
- - Role
- - OpenStackService
nova:
ca_ssl_cert: "/etc/ssl/certs/ca-certificates.crt"
enabled: True
diff --git a/xos-services/openstack/templates/deployment.yaml b/xos-services/openstack/templates/deployment.yaml
index b0270d1..8fa8c9c 100644
--- a/xos-services/openstack/templates/deployment.yaml
+++ b/xos-services/openstack/templates/deployment.yaml
@@ -45,8 +45,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: openstack-config
- mountPath: /opt/xos/synchronizers/openstack/openstack_config.yaml
- subPath: openstack_config.yaml
+ mountPath: /opt/xos/synchronizers/openstack/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: openstack
items:
- key: serviceConfig
- path: openstack_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/progran/templates/_helpers.tpl b/xos-services/progran/templates/_helpers.tpl
index 41053f8..cd0a765 100644
--- a/xos-services/progran/templates/_helpers.tpl
+++ b/xos-services/progran/templates/_helpers.tpl
@@ -52,17 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - ProgranService
- - ProgranServiceInstance
- - MCordSubscriberInstance
- - ENodeB
- - Handover
-dependency_graph: "/opt/xos/synchronizers/progran/model_deps"
-steps_dir: "/opt/xos/synchronizers/progran/steps"
-sys_dir: "/opt/xos/synchronizers/progran/sys"
-models_dir: "/opt/xos/synchronizers/progran/models"
-#model_policies_dir: "/opt/xos/synchronizers/progran/model_policies"
logging:
version: 1
handlers:
diff --git a/xos-services/progran/templates/deployment.yaml b/xos-services/progran/templates/deployment.yaml
index 729c4ce..416b9df 100644
--- a/xos-services/progran/templates/deployment.yaml
+++ b/xos-services/progran/templates/deployment.yaml
@@ -44,8 +44,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: progran-config
- mountPath: /opt/xos/synchronizers/progran/progran_config.yml
- subPath: progran_config.yml
+ mountPath: /opt/xos/synchronizers/progran/mounted_config.yml
+ subPath: mounted_config.yml
- name: certchain-volume
mountPath: /usr/local/share/ca-certificates/local_certs.crt
subPath: config/ca_cert_chain.pem
@@ -55,7 +55,7 @@
name: progran
items:
- key: serviceConfig
- path: progran_config.yml
+ path: mounted_config.yml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/sdncontroller/templates/_helpers.tpl b/xos-services/sdncontroller/templates/_helpers.tpl
index 41cbe8f..12048a9 100644
--- a/xos-services/sdncontroller/templates/_helpers.tpl
+++ b/xos-services/sdncontroller/templates/_helpers.tpl
@@ -52,15 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - SDNControllerService
- - SDNControllerVendor
- - SDNControllerServiceInstance
-dependency_graph: "/opt/xos/synchronizers/sdncontroller/model-deps"
-steps_dir: "/opt/xos/synchronizers/sdncontroller/steps"
-sys_dir: "/opt/xos/synchronizers/sdncontroller/sys"
-model_policies_dir: "/opt/xos/synchronizers/sdncontroller/model_policies"
-models_dir: "/opt/xos/synchronizers/sdncontroller/models"
logging:
version: 1
handlers:
diff --git a/xos-services/sdncontroller/templates/deployment.yaml b/xos-services/sdncontroller/templates/deployment.yaml
index 23d6095..221f308 100644
--- a/xos-services/sdncontroller/templates/deployment.yaml
+++ b/xos-services/sdncontroller/templates/deployment.yaml
@@ -44,8 +44,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: sdncontroller-config
- mountPath: /opt/xos/synchronizers/sdncontroller/sdncontroller_config.yaml
- subPath: sdncontroller_config.yaml
+ mountPath: /opt/xos/synchronizers/sdncontroller/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
@@ -61,7 +61,7 @@
name: sdncontroller
items:
- key: serviceConfig
- path: sdncontroller_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/vhss/templates/_helpers.tpl b/xos-services/vhss/templates/_helpers.tpl
index 5accd51..82ceead 100644
--- a/xos-services/vhss/templates/_helpers.tpl
+++ b/xos-services/vhss/templates/_helpers.tpl
@@ -52,15 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - VHSSService
- - VHSSVendor
- - VHSSTenant
-dependency_graph: "/opt/xos/synchronizers/vhss/model-deps"
-steps_dir: "/opt/xos/synchronizers/vhss/steps"
-sys_dir: "/opt/xos/synchronizers/vhss/sys"
-model_policies_dir: "/opt/xos/synchronizers/vhss/model_policies"
-models_dir: "/opt/xos/synchronizers/vhss/models"
logging:
version: 1
handlers:
diff --git a/xos-services/vhss/templates/deployment.yaml b/xos-services/vhss/templates/deployment.yaml
index abeb18a..6f1baf8 100644
--- a/xos-services/vhss/templates/deployment.yaml
+++ b/xos-services/vhss/templates/deployment.yaml
@@ -44,8 +44,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: vhss-config
- mountPath: /opt/xos/synchronizers/vhss/vhss_config.yaml
- subPath: vhss_config.yaml
+ mountPath: /opt/xos/synchronizers/vhss/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
@@ -61,7 +61,7 @@
name: vhss
items:
- key: serviceConfig
- path: vhss_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/vmme/templates/_helpers.tpl b/xos-services/vmme/templates/_helpers.tpl
index 3b7a765..d0f9f12 100644
--- a/xos-services/vmme/templates/_helpers.tpl
+++ b/xos-services/vmme/templates/_helpers.tpl
@@ -52,15 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - VMMEService
- - VMMEVendor
- - VMMETenant
-dependency_graph: "/opt/xos/synchronizers/vmme/model-deps"
-steps_dir: "/opt/xos/synchronizers/vmme/steps"
-sys_dir: "/opt/xos/synchronizers/vmme/sys"
-model_policies_dir: "/opt/xos/synchronizers/vmme/model_policies"
-models_dir: "/opt/xos/synchronizers/vmme/models"
logging:
version: 1
handlers:
diff --git a/xos-services/vmme/templates/deployment.yaml b/xos-services/vmme/templates/deployment.yaml
index b586a8e..5be3e82 100644
--- a/xos-services/vmme/templates/deployment.yaml
+++ b/xos-services/vmme/templates/deployment.yaml
@@ -44,8 +44,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: vmme-config
- mountPath: /opt/xos/synchronizers/vmme/vmme_config.yaml
- subPath: vmme_config.yaml
+ mountPath: /opt/xos/synchronizers/vmme/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
@@ -61,7 +61,7 @@
name: vmme
items:
- key: serviceConfig
- path: vmme_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/vspgwc/templates/_helpers.tpl b/xos-services/vspgwc/templates/_helpers.tpl
index 7786e55..6581ccf 100644
--- a/xos-services/vspgwc/templates/_helpers.tpl
+++ b/xos-services/vspgwc/templates/_helpers.tpl
@@ -52,15 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - VSPGWCService
- - VSPGWCVendor
- - VSPGWCTenant
-dependency_graph: "/opt/xos/synchronizers/vspgwc/model-deps"
-steps_dir: "/opt/xos/synchronizers/vspgwc/steps"
-sys_dir: "/opt/xos/synchronizers/vspgwc/sys"
-model_policies_dir: "/opt/xos/synchronizers/vspgwc/model_policies"
-models_dir: "/opt/xos/synchronizers/vspgwc/models"
logging:
version: 1
handlers:
@@ -77,43 +68,6 @@
- console
- file
level: DEBUG
-blueprints:
- - name: cord_5_0_blueprint
- graph:
- - name: VMMETenant
- links:
- - name: VHSSTenant
- - name: VSPGWCTenant
- links:
- - name: VMMETenant
- - name: VSPGWUTenant
- - name: VSPGWUTenant
- - name: VHSSTenant
- links:
- - name: HSSDBServiceInstance
- - name: HSSDBServiceInstance
- - name: cord_4_1_blueprint
- graph:
- - name: VSPGWUTenant
- links:
- - name: VENBServiceInstance
- - name: VENBServiceInstance
- - name: VSPGWCTenant
- links:
- - name: VENBServiceInstance
- - name: VSPGWUTenant
- - name: cord_5_p4_blueprint
- graph:
- - name: VMMETenant
- links:
- - name: VHSSTenant
- - name: VSPGWCTenant
- links:
- - name: VMMETenant
- - name: HSSTenant
- links:
- - name: HSSDBServiceInstance
- - name: HSSDBServiceInstance
proxy_ssh:
enabled: {{ .Values.global.proxySshEnabled }}
user: {{ .Values.global.proxySshUser }}
diff --git a/xos-services/vspgwc/templates/deployment.yaml b/xos-services/vspgwc/templates/deployment.yaml
index 568d39d..a180f0a 100644
--- a/xos-services/vspgwc/templates/deployment.yaml
+++ b/xos-services/vspgwc/templates/deployment.yaml
@@ -44,8 +44,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: vspgwc-config
- mountPath: /opt/xos/synchronizers/vspgwc/vspgwc_config.yaml
- subPath: vspgwc_config.yaml
+ mountPath: /opt/xos/synchronizers/vspgwc/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
@@ -61,7 +61,7 @@
name: vspgwc
items:
- key: serviceConfig
- path: vspgwc_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/vspgwu/templates/_helpers.tpl b/xos-services/vspgwu/templates/_helpers.tpl
index e14cce5..2932dcb 100644
--- a/xos-services/vspgwu/templates/_helpers.tpl
+++ b/xos-services/vspgwu/templates/_helpers.tpl
@@ -52,15 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - VSPGWUService
- - VSPGWUVendor
- - VSPGWUTenant
-dependency_graph: "/opt/xos/synchronizers/vspgwu/model-deps"
-steps_dir: "/opt/xos/synchronizers/vspgwu/steps"
-sys_dir: "/opt/xos/synchronizers/vspgwu/sys"
-model_policies_dir: "/opt/xos/synchronizers/vspgwu/model_policies"
-models_dir: "/opt/xos/synchronizers/vspgwu/models"
logging:
version: 1
handlers:
diff --git a/xos-services/vspgwu/templates/deployment.yaml b/xos-services/vspgwu/templates/deployment.yaml
index 52d9635..7fee01a 100644
--- a/xos-services/vspgwu/templates/deployment.yaml
+++ b/xos-services/vspgwu/templates/deployment.yaml
@@ -44,8 +44,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: vspgwu-config
- mountPath: /opt/xos/synchronizers/vspgwu/vspgwu_config.yaml
- subPath: vspgwu_config.yaml
+ mountPath: /opt/xos/synchronizers/vspgwu/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
@@ -61,7 +61,7 @@
name: vspgwu
items:
- key: serviceConfig
- path: vspgwu_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/vtn-service/templates/_helpers.tpl b/xos-services/vtn-service/templates/_helpers.tpl
index 8860c56..ef1585d 100644
--- a/xos-services/vtn-service/templates/_helpers.tpl
+++ b/xos-services/vtn-service/templates/_helpers.tpl
@@ -52,20 +52,6 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - AddressPool
- - Controller
- - Network
- - Node
- - Port
- - Service
- - ServiceInstance
- - Tag
- - VTNService
-dependency_graph: "/opt/xos/synchronizers/vtn/model-deps"
-models_dir: "/opt/xos/synchronizers/vtn/models"
-sys_dir: "/opt/xos/synchronizers/vtn/sys"
-steps_dir: "/opt/xos/synchronizers/vtn/steps"
logging:
version: 1
handlers:
diff --git a/xos-services/vtn-service/templates/deployment.yaml b/xos-services/vtn-service/templates/deployment.yaml
index 2b8c37f..e76115f 100644
--- a/xos-services/vtn-service/templates/deployment.yaml
+++ b/xos-services/vtn-service/templates/deployment.yaml
@@ -45,8 +45,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: vtn-config
- mountPath: /opt/xos/synchronizers/vtn/vtn_config.yaml
- subPath: vtn_config.yaml
+ mountPath: /opt/xos/synchronizers/vtn/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: vtn
items:
- key: serviceConfig
- path: vtn_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates