Add cloud name for VCA

This will add an additional VCA configuration option
which is needed for multicloud controller support in
N2VC. This will need no changes in the installer and
will default to the same values as before.

Change-Id: Ibccc2b102f056674117b6d98c43a3c357a78f40f
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>

diff --git a/Dockerfile.fromdeb b/Dockerfile.fromdeb
index d49995a..95b0ff3 100644 (file)
--- a/Dockerfile.fromdeb
+++ b/Dockerfile.fromdeb
@@ -63,6 +63,7 @@ ENV OSMLCM_VCA_HOST        vca
 ENV OSMLCM_VCA_PORT:       17070
 ENV OSMLCM_VCA_USER:       admin
 ENV OSMLCM_VCA_SECRET:     secret
+ENV OSMLCM_VCA_CLOUD:      localhost
 
 # database
 ENV OSMLCM_DATABASE_DRIVER mongo

diff --git a/Dockerfile.local b/Dockerfile.local
index 36c6710..25775d6 100644 (file)
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -72,6 +72,7 @@ ENV OSMLCM_VCA_HOST        vca
 ENV OSMLCM_VCA_PORT        17070
 ENV OSMLCM_VCA_USER        admin
 ENV OSMLCM_VCA_SECRET      secret
+ENV OSMLCM_VCA_CLOUD:      localhost
 # ENV OSMLCM_VCA_ENABLEOSUPGRADE false
 # ENV OSMLCM_VCA_APTMIRROR  http://archive.ubuntu.com/ubuntu/
 # ENV OSMLCM_VCA_PUBKEY     pubkey

diff --git a/osm_lcm/lcm.cfg b/osm_lcm/lcm.cfg
index d100489..fa72b7f 100644 (file)
--- a/osm_lcm/lcm.cfg
+++ b/osm_lcm/lcm.cfg
@@ -41,6 +41,7 @@ VCA:
     port:   17070
     user:   admin
     secret: secret
+    cloud:  localhost
     helmpath:    /usr/local/bin/helm
     kubectlpath: /usr/bin/kubectl
     jujupath:    /usr/local/bin/juju