diff options
| author |   Ritu Sood <Ritu.Sood@intel.com> | 2019-09-05 17:18:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-05 17:18:00 +0000 |
| commit | 77ce224e1b3736f0c0b398b5a5b57ea58ebbaa55 (patch) | |
| tree | 2d6fd63387b78c9bdeac0865f54d6f9a99e1876e /deployments | |
| parent | ffa9e22fe906c805928d952bb6e60d5ece86f77d (diff) | |
| parent | b5431ed7c0f4659269143daedb1651ef9a303a89 (diff) | |
Merge "Remove ovn4nfvk8s network plugin"
Diffstat (limited to 'deployments')
| -rw-r--r-- | deployments/Dockerfile | 4 | ||||
| -rwxr-xr-x | deployments/_functions.sh | 5 |
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 |