Merge "Closes-Bug: #1417411 Server Manager: Remove keystone-auth.conf…

… for config server, untill multi-tenancy is enabled" into R2.1
Juniper · Feb 3, 2015 · 2d16dd8 · 2d16dd8
2 parents 1723f74 + 5dff0d8
commit 2d16dd8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/config.pp b/contrail/environment/modules/contrail/manifests/config.pp
@@ -380,12 +380,6 @@
 	    content => template("$module_name/ctrl-details.erb"),
 	}
     }
-    if ! defined(File["/etc/contrail/contrail-keystone-auth.conf"]) {
-	file { "/etc/contrail/contrail-keystone-auth.conf" :
-	    ensure  => present,
-	    content => template("$module_name/contrail-keystone-auth.conf.erb"),
-	}
-    }
 
     # Ensure service.token file is present with right content.
     if ! defined(File["/etc/contrail/service.token"]) {

diff --git a/contrail/environment/modules/contrail/templates/contrail-api.ini.erb b/contrail/environment/modules/contrail/templates/contrail-api.ini.erb
@@ -1,5 +1,5 @@
 [program:contrail-api]
-command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --conf_file /etc/contrail/contrail-keystone-auth.conf --listen_port <%= @api_port_base %>%(process_num)01d --worker_id %(process_num)s
+command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --listen_port <%= @api_port_base %>%(process_num)01d --worker_id %(process_num)s
 numprocs=<%= @api_nworkers %>
 process_name=%(process_num)s
 redirect_stderr=true

diff --git a/contrail/environment/modules/contrail/templates/contrail-keystone-auth.conf.erb b/contrail/environment/modules/contrail/templates/contrail-keystone-auth.conf.erb