Remove admin_token from config

Change-Id: I31626f39431920ee55e64060d7c24569a56f749d Closes-Bug: #1791861
Juniper · Sep 20, 2018 · 169cf39 · 169cf39
1 parent 816644c
commit 169cf39
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/manifests/network/contrail/analytics.pp b/manifests/network/contrail/analytics.pp
@@ -270,16 +270,19 @@
   $redis_config = "bind ${host_ip} 127.0.0.1"
   $zk_server_ip_2181 = join([join($zk_server_ip, ':2181 '),':2181'],'')
   $zk_server_ip_2181_comma = join([join($zk_server_ip, ':2181,'),':2181'],'')
+  $keystone_no_auth_token = {
+    'admin_token' => { 'ensure' => absent },
+  }
   if $auth_version == 2 {
-    $keystone_config_ver = {}
+    $keystone_config_ver = $keystone_no_auth_token
     $auth_url_suffix = 'v2.0'
     $vnc_authn_url = '/v2.0/tokens'
   } else {
-    $keystone_config_ver = {
+    $keystone_config_ver = deep_merge($keystone_no_auth_token, {
       'auth_type'               => $keystone_auth_type,
       'project_domain_name'     => $keystone_project_domain_name,
       'user_domain_name'        => $keystone_user_domain_name,
-    }
+    })
     $auth_url_suffix = 'v3'
     $vnc_authn_url = '/v3/auth/tokens'
   }

diff --git a/manifests/network/contrail/config.pp b/manifests/network/contrail/config.pp
@@ -296,18 +296,23 @@
   $rabbit_server_list_5672 = join([join($rabbit_server, ':5672,'),':5672'],'')
   $zk_server_ip_2181 = join([join($zk_server_ip, ':2181,'),':2181'],'')
   $analytics_server_list_8081 = join([join($analytics_server_list, ':8081 '),':8081'],'')
+  $keystone_no_auth_token = {
+    'KEYSTONE' => {
+      'admin_token' => { 'ensure' => absent },
+    }
+  }
   if $auth_version == 2 {
-    $keystone_config_ver = {}
+    $keystone_config_ver = $keystone_no_auth_token
     $auth_url_suffix = 'v2.0'
     $vnc_authn_url = '/v2.0/tokens'
   } else {
-    $keystone_config_ver = {
+    $keystone_config_ver = deep_merge($keystone_no_auth_token, {
       'KEYSTONE' => {
         'auth_type'               => $keystone_auth_type,
         'project_domain_name'     => $keystone_project_domain_name,
         'user_domain_name'        => $keystone_user_domain_name,
       },
-    }
+    })
     $auth_url_suffix = 'v3'
     $vnc_authn_url = '/v3/auth/tokens'
   }

diff --git a/manifests/network/contrail/vrouter.pp b/manifests/network/contrail/vrouter.pp
@@ -224,19 +224,23 @@
     $control_server_list_53 = join([join($control_node_ips, ':53 '),':53'],'')
     $control_server_list_5269 = join([join($control_node_ips, ':5269 '),':5269'],'')
   }
-
+  $keystone_no_auth_token = {
+    'KEYSTONE' => {
+      'admin_token' => { 'ensure' => absent },
+    }
+  }
   if $auth_version == 2 {
-    $keystone_config_ver = {}
+    $keystone_config_ver = $keystone_no_auth_token
     $auth_url_suffix = 'v2.0'
     $vnc_authn_url = '/v2.0/tokens'
   } else {
-    $keystone_config_ver = {
+    $keystone_config_ver = deep_merge($keystone_no_auth_token, {
       'KEYSTONE' => {
         'auth_type'               => $keystone_auth_type,
         'project_domain_name'     => $keystone_project_domain_name,
         'user_domain_name'        => $keystone_user_domain_name,
       },
-    }
+    })
     $auth_url_suffix = 'v3'
     $vnc_authn_url = '/v3/auth/tokens'
   }