Merge "Closes-Bug: #1616665 - Missing Keystone-auth.conf file on sepa…

…rate collector node" into R3.0
Juniper · Sep 6, 2016 · c1a7d1d · c1a7d1d
2 parents 18e98f1 + d216a84
commit c1a7d1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/contrail/environment/modules/contrail/manifests/collector/config.pp b/contrail/environment/modules/contrail/manifests/collector/config.pp
@@ -15,6 +15,7 @@
     $redis_password = $::contrail::params::redis_password,
     $config_ip_to_use = $::contrail::params::config_ip_to_use,
     $contrail_logoutput = $::contrail::params::contrail_logoutput,
+    $host_roles = $::contrail::params::host_roles,
 ) {
 
     $rest_api_port_to_use = $::contrail::params::rest_api_port_to_use
@@ -220,4 +221,7 @@
     file { '/etc/snmp/snmp.conf':
       content => 'mibs +ALL'
     }
+    if (!('config' in $host_roles)) {
+        contain ::contrail::keystone
+    }
 }
diff --git a/contrail/environment/modules/contrail/manifests/keystone.pp b/contrail/environment/modules/contrail/manifests/keystone.pp
@@ -7,6 +7,7 @@
     $keystone_admin_tenant = $::contrail::params::keystone_admin_tenant,
     $keystone_insecure_flag = $::contrail::params::keystone_insecure_flag,
     $multi_tenancy = $::contrail::params::multi_tenancy,
+    $host_roles = $::contrail::params::host_roles,
 ) {
   contrail_keystone_auth_config {
     'KEYSTONE/auth_host' : value => $keystone_ip_to_use;
@@ -17,7 +18,7 @@
     'KEYSTONE/admin_tenant_name' : value => $keystone_admin_tenant;
     'KEYSTONE/insecure' :  value => $keystone_insecure_flag;
   }
-  if $multi_tenancy == true {
+  if (($multi_tenancy == true) and ('config' in $host_roles)) {
     contrail_keystone_auth_config {
       'KEYSTONE/memcache_servers' : value => '127.0.0.1:11211'
     }