summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDileep Ranganathan <dileep.ranganathan@intel.com>2018-06-04 05:14:38 -0700
committerDileep Ranganathan <dileep.ranganathan@intel.com>2018-06-04 19:26:55 +0000
commit9f27e4f3c2518c3f8df7f8653d89b4912f205b31 (patch)
tree169c105dfe84e4e3c9f315953930c6f99eea1197
parentb226ac1dff4c4a0d8e72aafdf343a19f41aad3ea (diff)
Fix OOF configuration
Added missing multicloud section in conductor.conf Updated music version to reflect the latest version Change-Id: I7e943c4344c63d4e18df9f00f6b61600e97295a7 Issue-ID: OPTFRA-232 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
-rwxr-xr-xconductor.conf32
1 files changed, 30 insertions, 2 deletions
diff --git a/conductor.conf b/conductor.conf
index 16907ed..a2a4765 100755
--- a/conductor.conf
+++ b/conductor.conf
@@ -252,11 +252,11 @@ timeout = 300
#
# From conductor
#
-music_new_version = True
+music_new_version = True
# Base URL for Music REST API without a trailing slash. (string value)
server_url = http://localhost:8080/MUSIC/rest/v2
version = v2
-music_version = "2.4.21"
+music_version = "2.5.3"
aafuser = conductor
aafpass = c0nduct0r
aafns = conductor
@@ -348,3 +348,31 @@ concurrent = true
[reservation]
concurrent = true
+
+[multicloud]
+
+#
+# From conductor
+#
+
+# Base URL for Multicloud without a trailing slash. (string value)
+server_url = http://msb.onap.org:80/api/multicloud
+
+# Timeout for Multicloud Rest Call (string value)
+multicloud_rest_timeout = 30
+
+# Number of retry for Multicloud Rest Call (string value)
+multicloud_retries = 3
+
+# The version of Multicloud API. (string value)
+server_url_version = v0
+
+
+[vim_controller]
+#
+# From conductor
+#
+
+# Extensions list to use (list value)
+extensions = multicloud
+