Browse Source

Adjust tackerc to 3rd version of identity api

Change-Id: Ia2de01863709201ac81b4ea32ddce348f4a2d799
Michael Polenchuk 2 years ago
parent
commit
7068a300df
1 changed files with 15 additions and 12 deletions
  1. 15
    12
      deployment_scripts/puppet/manifests/tacker_rc.pp

+ 15
- 12
deployment_scripts/puppet/manifests/tacker_rc.pp View File

@@ -16,22 +16,25 @@ $auth_uri               = "${public_auth_protocol}://${public_auth_address}:5000
16 16
 $tackerc = inline_template("
17 17
 #!/bin/sh
18 18
 export LC_ALL=C
19
-export OS_NO_CACHE='true'
20
-export OS_TENANT_NAME='<%= @tacker_tenant %>'
21
-export OS_PROJECT_NAME='<%= @tacker_tenant %>'
22
-export OS_USERNAME='<%= @tacker_user %>'
23
-export OS_PASSWORD='<%= @tacker_user_password %>'
24
-export OS_AUTH_URL='<%= @auth_uri %>'
25
-export OS_DEFAULT_DOMAIN='default'
26
-export OS_AUTH_STRATEGY='keystone'
27
-export OS_REGION_NAME='RegionOne'
28
-export TACKER_ENDPOINT_TYPE='internalURL'
19
+export OS_NO_CACHE=true
20
+export OS_TENANT_NAME=<%= @tacker_tenant %>
21
+export OS_PROJECT_NAME=<%= @tacker_tenant %>
22
+export OS_USERNAME=<%= @tacker_user %>
23
+export OS_PASSWORD=<%= @tacker_user_password %>
24
+export OS_AUTH_URL=<%= @auth_uri %>
25
+export OS_IDENTITY_API_VERSION=3
26
+export OS_DEFAULT_DOMAIN=default
27
+export OS_USER_DOMAIN_NAME=Default
28
+export OS_PROJECT_DOMAIN_NAME=Default
29
+export OS_AUTH_STRATEGY=keystone
30
+export OS_REGION_NAME=RegionOne
31
+export TACKER_ENDPOINT_TYPE=internalURL
29 32
 ")
30 33
 
31 34
 file { '/root/tackerc':
35
+    ensure  => file,
32 36
     owner   => 'root',
33 37
     group   => 'root',
34 38
     mode    => '0700',
35
-    ensure  => file,
36
-    content => "${tackerc}",
39
+    content => $tackerc,
37 40
 }

Loading…
Cancel
Save