EDGEPOD-114 Enhance CDN-local to better support of hostNetwork
Also renamed resouce names from nginx to cdn-local.
Change-Id: Ib77f18b8e8ea2efcb73c0d36a621bdee5eea2f33
diff --git a/ott-services/cdn-local/templates/bin/_network-config.sh.tpl b/ott-services/cdn-local/templates/bin/_network-config.sh.tpl
deleted file mode 100644
index 9402049..0000000
--- a/ott-services/cdn-local/templates/bin/_network-config.sh.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2019-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-ip link set {{ .Values.config.nginx.sgi.device }} mtu {{ .Values.config.nginx.mtu }}
\ No newline at end of file
diff --git a/ott-services/cdn-local/templates/bin/_route-gen.sh.tpl b/ott-services/cdn-local/templates/bin/_route-gen.sh.tpl
deleted file mode 100644
index 7dcea6c..0000000
--- a/ott-services/cdn-local/templates/bin/_route-gen.sh.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2019-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-SPGWU_IP=$(echo {{ .Values.config.spgwu.sgi.ip }} | awk -F '/' '{print $1}')
-
-netmask_to_prefix() {
- prefix=0
- octat=0$( printf '%o' ${1//./ } )
- while [ $octat -gt 0 ];
- do
- prefix=$(( $prefix + $(( $octat % 2))))
- octat=$(( $octat >> 1))
- done
- echo $prefix
-}
-
-ip route add {{ .Values.config.spgwc.ueIpPool.ip }}/$(netmask_to_prefix {{ .Values.config.spgwc.ueIpPool.mask }} ) via $SPGWU_IP dev {{ .Values.config.nginx.sgi.device }}
-
-
diff --git a/ott-services/cdn-local/templates/bin/_run-nginx.sh.tpl b/ott-services/cdn-local/templates/bin/_run-nginx.sh.tpl
index cde099e..ffe7916 100644
--- a/ott-services/cdn-local/templates/bin/_run-nginx.sh.tpl
+++ b/ott-services/cdn-local/templates/bin/_run-nginx.sh.tpl
@@ -14,5 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# Assume that SGI network gateway knows routes to UE pool
+{{- if .Values.config.sriov.enabled }}
+ip route add {{ .Values.networks.ue.subnet }} via {{ .Values.networks.sgi.gateway }}
+{{- end }}
+
+ip link set {{ .Values.config.nginx.sgiInterface.name }} mtu {{ .Values.config.nginx.sgiInterface.mtu }}
+
cp /conf/nginx.conf /etc/nginx/
-nginx -g "daemon off;"
\ No newline at end of file
+nginx -g "daemon off;"