1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From 424c6439e26b53dbc647320580a8428c4499b72c Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Thu, 13 Dec 2018 12:38:12 +0100
Subject: Fix API service scheduling
This small patch fixes a bug in scheduling:
Service['aodh-api'] -> Service[$service_name]
is added, and the wrong scheduling in keystone's endpoint is removed.
Change-Id: I9e141b70d52d64b72555de7a15043303f57b5cc0
---
manifests/api.pp | 1 +
manifests/keystone/auth.pp | 5 -----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/manifests/api.pp b/manifests/api.pp
index a977cd7..27801d2 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -82,6 +82,7 @@ class cloudkitty::api (
enable => false,
tag => 'cloudkitty-service',
}
+ Service['cloudkitty-api'] -> Service[$service_name]
} else {
fail('Invalid service_name. Only httpd for being run by a httpd server')
}
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index d5c12e2..0cb274c 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -81,11 +81,6 @@ class cloudkitty::keystone::auth (
include ::cloudkitty::deps
- if $configure_user_role {
- Keystone_user_role["${auth_name}@${tenant}"] ~> Anchor['cloudkitty::config::end']
- }
- Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Anchor['cloudkitty::config::end']
-
keystone::resource::service_identity { 'cloudkitty':
configure_user => $configure_user,
configure_user_role => $configure_user_role,
--
cgit v1.1
|
