aboutsummaryrefslogtreecommitdiffstats
path: root/deployments
diff options
context:
space:
mode:
authorKonrad Bańka <k.banka@samsung.com>2019-09-04 17:22:42 +0200
committerRitu Sood <Ritu.Sood@intel.com>2019-09-05 16:50:50 +0000
commitb5431ed7c0f4659269143daedb1651ef9a303a89 (patch)
tree7cc08f87d2580e8f5fe490bf154b1edf230d61e4 /deployments
parent94174f17d9bbc8187f668e1656527473c38e9d4c (diff)
Remove ovn4nfvk8s network plugin
As ovn4nfv networks are now handled on k8s side by created CRD, this plugin is no longer necessary. Removed all references to ovn Issue-ID: MULTICLOUD-733 Signed-off-by: Konrad Bańka <k.banka@samsung.com> Change-Id: I7ad6c6d9b3b4fd8f249796f437e69c7df4e701cc
Diffstat (limited to 'deployments')
-rw-r--r--deployments/Dockerfile4
-rwxr-xr-xdeployments/_functions.sh5
2 files changed, 0 insertions, 9 deletions
diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index dfe16cb1..842345c2 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -19,10 +19,6 @@ ENV no_proxy $NO_PROXY
EXPOSE 9015
RUN groupadd -r onap && useradd -r -g onap onap
-RUN apt-get update && apt-get install -y -qq apt-transport-https curl \
- && echo "deb https://packages.wand.net.nz xenial main" > /etc/apt/sources.list.d/wand.list \
- && curl https://packages.wand.net.nz/keyring.gpg -o /etc/apt/trusted.gpg.d/wand.gpg \
- && apt-get update && apt install -y -qq ovn-common
WORKDIR /opt/multicloud/k8splugin
RUN chown onap:onap /opt/multicloud/k8splugin -R
diff --git a/deployments/_functions.sh b/deployments/_functions.sh
index 45f2d8cf..47074433 100755
--- a/deployments/_functions.sh
+++ b/deployments/_functions.sh
@@ -21,16 +21,11 @@ function start_mongo {
}
function generate_k8sconfig {
- local ovn_address
- if [ -n "${OVN_CENTRAL_ADDRESS:-}" ]; then
- ovn_address="\"ovn-central-address\": \"${OVN_CENTRAL_ADDRESS}\","
- fi
cat << EOF > k8sconfig.json
{
"database-address": "${DATABASE_IP}",
"database-type": "mongo",
"plugin-dir": "plugins",
- ${ovn_address}
"service-port": "9015"
}
EOF