Merge "analytics: user defined counter fab support" into R3.1

Juniper · Jul 13, 2016 · 1cfb4a1 · 1cfb4a1
2 parents 96ae108 + 26b88d1
commit 1cfb4a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/analytics/options.cc b/src/analytics/options.cc
@@ -205,6 +205,8 @@ void Options::Initialize(EventManager &evm,
                     "tenant"), "Keystone tenant")
         ("KEYSTONE.insecure", opt::bool_switch(&ks_insecure_),
                     "keystone using tls")
+        ("KEYSTONE.auth_url", opt::value<string>()->default_value("a.com"),
+                    "keystone auth url")
         ("KEYSTONE.memcache_servers", opt::value<string>()->default_value(
                     "127.0.0.1:11211"), "memcache servers")
         ("KEYSTONE.certfile", opt::value<string>()->default_value(
@@ -381,6 +383,7 @@ void Options::Process(int argc, char *argv[],
     GetOptValue<string>(var_map, ks_user_, "KEYSTONE.admin_user");
     GetOptValue<string>(var_map, ks_password_, "KEYSTONE.admin_password");
     GetOptValue<string>(var_map, ks_tenant_, "KEYSTONE.admin_tenant_name");
+    GetOptValue<string>(var_map, ks_authurl_, "KEYSTONE.auth_url");
     GetOptValue<string>(var_map, memcache_servers_, "KEYSTONE.memcache_servers");
     GetOptValue<string>(var_map, ks_cert_, "KEYSTONE.certfile");
     GetOptValue<string>(var_map, ks_key_, "KEYSTONE.keyfile");

diff --git a/src/analytics/options.h b/src/analytics/options.h
@@ -147,6 +147,7 @@ class Options {
     std::string ks_user_;
     std::string ks_password_;
     std::string ks_tenant_;
+    std::string ks_authurl_;
     bool        ks_insecure_;
     std::string memcache_servers_;
     std::string ks_cert_;