[CORD-3022] Splitting config in MCORD services
Change-Id: I90e061ad4873d0b010e2060c21a49de28a84b3a3
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