Allow configuring domin_id in the contrailctl

config files. Change-Id: I85e3c5f758ba65b5f0f6626654a517249bdfd64e Partial-Bug: 1724691
Juniper · Oct 25, 2017 · 2506f60 · 2506f60
1 parent 15809fa
commit 2506f60
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/tools/python-contrailctl/examples/configs/agent.conf b/tools/python-contrailctl/examples/configs/agent.conf
@@ -89,6 +89,16 @@
 #Required only if using privately signed certfile and keyfile
 #cafile = /etc/contrailctl/ssl/ca-cert.pem
 
+#project_domain_name - Project domain name for keystone v3
+#Optional for keystone v3, if no specified domain scope auth
+#will be used with domain_id=default
+#Project_domain_name = Default
+
+#domain_id- Domain id for keystone v3
+#Optional for keystone v3, if no specified domain scope auth
+#will be used with domain_id=default
+#domain_id = default
+
 [AGENT]
 # physical interface used by vhost interface
 # vrouter_physical_interface = eth0

diff --git a/tools/python-contrailctl/examples/configs/analytics.conf b/tools/python-contrailctl/examples/configs/analytics.conf
@@ -106,9 +106,15 @@
 #user_domain_name = Default
 
 #project_domain_name - Project domain name for keystone v3
-#Required for keystone v3
+#Optional for keystone v3, if no specified domain scope auth
+#will be used with domain_id=default
 #Project_domain_name = Default
 
+#domain_id- Domain id for keystone v3
+#Optional for keystone v3, if no specified domain scope auth
+#will be used with domain_id=default
+#domain_id = default
+
 [ALARM_GEN]
 # Log file and log level
 # log = /var/log/contrail/contrail-alarm-gen.log

diff --git a/tools/python-contrailctl/examples/configs/controller.conf b/tools/python-contrailctl/examples/configs/controller.conf
@@ -189,9 +189,15 @@
 #user_domain_name = Default
 
 #project_domain_name - Project domain name for keystone v3
-#Required for keystone v3
+#Optional for keystone v3, if no specified domain scope auth
+#will be used with domain_id=default
 #Project_domain_name = Default
 
+#domain_id- Domain id for keystone v3
+#Optional for keystone v3, if no specified domain scope auth
+#will be used with domain_id=default
+#domain_id = default
+
 [CONTROL]
 # BGP port number
 # bgp_port=179

diff --git a/tools/python-contrailctl/schema/definitions.json b/tools/python-contrailctl/schema/definitions.json
@@ -359,6 +359,10 @@
         "project_domain_name": {
           "description": "Project domain name for keystone v3",
           "type": "string"
+        },
+        "domain_id": {
+          "description": "Domain id for keystone v3",
+          "type": "string"
         }
       }
     },