Updates branch sol006 with master

[osm/LCM.git] / osm_lcm / lcm.cfg

diff --git a/osm_lcm/lcm.cfg b/osm_lcm/lcm.cfg
index 3bc1ba0..e2e34d4 100644 (file)
--- a/osm_lcm/lcm.cfg
+++ b/osm_lcm/lcm.cfg
@@ -22,6 +22,11 @@ global:
     # logfile:  /app/log  # or /var/log/osm/lcm.log
     # nologging: True     # do no log to stdout/stderr
 
+#[timeout]
+timeout:
+    # ns_deploy: 7200     # total deploy timeout for a ns 2 hours
+    # nsi_deploy: 7200     # total deploy timeout for a nsi 2 hours
+
 #[RO]
 RO:
     host:   ro          # hostname or IP
@@ -36,6 +41,11 @@ VCA:
     port:   17070
     user:   admin
     secret: secret
+    cloud:  localhost
+    k8s_cloud: k8scloud
+    helmpath:    /usr/local/bin/helm
+    kubectlpath: /usr/bin/kubectl
+    jujupath:    /usr/local/bin/juju
     # pubkey: pubkey
     # cacert: cacert
     # apiproxy: apiproxy
@@ -74,3 +84,11 @@ message:
     # loglevel: DEBUG
     # logfile:  /var/log/osm/lcm-message.log
     group_id: lcm-server
+
+tsdb:    # time series database
+    driver:   prometheus
+    # local file to store the configuration
+    path:     /etc/prometheus
+    uri:      http://prometheus:9090/
+    # loglevel: DEBUG
+    # logfile:  /var/log/osm/lcm-tsdb.log