Define PLMNID in values.yaml to change easier and change CNI to static
Change-Id: Id807240431aac91ec9be9204ce6cd2f62c3bb585
diff --git a/comac-cu/Chart.yaml b/comac-cu/Chart.yaml
index f5b5ab3..d676f38 100644
--- a/comac-cu/Chart.yaml
+++ b/comac-cu/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart to install CU/BBU in COMAC
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.0.6
-appVersion: 0.0.6
+version: 0.0.7
+appVersion: 0.0.7
diff --git a/comac-cu/templates/networks.yaml b/comac-cu/templates/networks.yaml
index af46aa5..fd6a696 100644
--- a/comac-cu/templates/networks.yaml
+++ b/comac-cu/templates/networks.yaml
@@ -26,14 +26,6 @@
config: '{
"type": {{ .Values.network.f1.cni_plugin | quote }},
"ipam": {
- "type": {{ .Values.network.f1.ipam | quote }},
- {{- if eq .Values.network.f1.ipam "host-local" }}
- "subnet": {{ .Values.network.f1.subnet | quote }},
- "gateway": {{ .Values.network.f1.gateway | quote }}
- {{- else if eq .Values.network.f1.ipam "centralip" }}
- "ipType": "cluster",
- "network": {{ .Values.network.f1.subnet | quote }},
- "etcdURL": {{ .Values.network.etcdurl | quote }}
- {{- end }}
+ "type": {{ .Values.network.f1.ipam | quote }}
}
}'
\ No newline at end of file
diff --git a/comac-cu/templates/statefulset-accelleran.yaml b/comac-cu/templates/statefulset-accelleran.yaml
index 0e991e8..6dd84f9 100644
--- a/comac-cu/templates/statefulset-accelleran.yaml
+++ b/comac-cu/templates/statefulset-accelleran.yaml
@@ -32,7 +32,11 @@
app: {{ .Values.cu.name }}
annotations:
k8s.v1.cni.cncf.io/networks: '[
- { "name": "f1-net-cu", "interface": "f1-net-cu" }
+ {
+ "name": "f1-net-cu",
+ "interface": {{ .Values.cu.accelleran.interface | quote }},
+ "ips": {{ .Values.cu.accelleran.ips | quote }}
+ }
]'
spec:
@@ -109,7 +113,7 @@
args:
- sqlite3 /mnt/app/datastore.db "update cellS1apConfig set enbSctpPort={{ .Values.cu.accelleran.ports.s1ap }};";
sqlite3 /mnt/app/datastoreRemRw.db "update FapServiceFapControlLteGateway set S1SigLinkPort={{ .Values.mme.port }};";
- sqlite3 /mnt/app/datastoreRemRw.db "update FapServiceCellConfigLteEpcPlmnList set PLMNID=371211;";
+ sqlite3 /mnt/app/datastoreRemRw.db "update FapServiceCellConfigLteEpcPlmnList set PLMNID={{ .Values.epc.config.plmnid }};";
sqlite3 /mnt/app/datastore.db "insert into enbSctpSocketInterface ('interfaceName') values ('{{ .Values.enb.socket_interface }}');";
sqlite3 /mnt/app/datastore.db "update logging set severity=7 where id=25;";
{{- if .Values.cu.accelleran.progran.enabled }}
diff --git a/comac-cu/values.yaml b/comac-cu/values.yaml
index b3e5302..6f7d41a 100644
--- a/comac-cu/values.yaml
+++ b/comac-cu/values.yaml
@@ -12,6 +12,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+epc:
+ config:
+ plmnid: 371211
mme:
nodeport_ip_addr: "10.90.0.132"
@@ -27,6 +30,8 @@
nodeselector:
sriov: netdevice
accelleran:
+ ips: 116.0.0.3/24
+ interface: f1-net-cu
images:
init: "ngick8stesting/c3po-mmeinit"
nats: "node1:30500/accelleran/vran-nats:20190121"
@@ -53,6 +58,6 @@
etcdurl: http://node1:32379
f1:
cni_plugin: sriov
- ipam: centralip
+ ipam: static
subnet: 116.0.0.0/24
gateway: 116.0.0.254