Skip to content

Commit 4f192e0

Browse files
committed
Update cASO configuration for Ussuri onwards
Fixes #88
1 parent d1bd16b commit 4f192e0

File tree

4 files changed

+79
-13
lines changed

4 files changed

+79
-13
lines changed

caso/messenger/ssm.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ def push_compute_message(self, queue, entries):
5959
message = "APEL-cloud-message: v%s\n" % self.compute_version
6060
aux = "%%\n".join(entries)
6161
message += "%s\n" % aux
62+
message = message.encode("utf-8")
6263
queue.add(message)
6364

6465
def push_ip_message(self, queue, entries):

doc/source/configuration.rst

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,31 @@ In order to do so, we are going to setup a new role ``accounting`` a new user
3939
# For each of the projects, add the user with the accounting role
4040
openstack role add --user accounting --project <project> accounting
4141

42-
Moreover, this user needs access to Keystone so as to extract the users
42+
Policy modifications
43+
--------------------
44+
The accounting user needs access to Keystone so as to extract the users
4345
information. In this case, we can can grant the user just the rights for
44-
listing the users adding the appropriate rules in your
45-
``/etc/keystone/policy.json`` as follows. Replace the line::
46+
listing the users adding the appropriate rules in your policy configuration.
47+
The modifications in the policy depend on the Keystone version, please ensure
48+
that you are applying the correct changes.
4649

47-
"identity:list_users": "rule:admin_required",
50+
Keystone Versions from Ussuri onwards (version >= 17.0.0)
51+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4852

49-
with::
53+
You need to modify the ``identity:list_users`` policy in either your
54+
``/etc/keystone/policy.json`` or ``/etc/keystone/policy-yaml``, contaning the
55+
following policy rules::
5056

51-
"identity:list_users": "rule:admin_required or role:accounting",
57+
"identity:list_users": "(role:admin) or (role:reader and domain_id:%(target.domain_id)s) or (role:accounting)"
5258

53-
Recent Keystone versions leverage a ``/etc/keystone/policy-yaml`` file, if this
54-
is your case, substitute the line::
59+
Keystone Versions from until Train (version < 17.0.0)
60+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5561

56-
"identity:list_users": "rule:admin_required"
57-
58-
with::
59-
60-
"identity:list_users": "rule:admin_required or role:accounting"
62+
You need to modify the ``identity:list_users`` policy in either your
63+
``/etc/keystone/policy.json`` or ``/etc/keystone/policy-yaml``, contaning the
64+
following policy rules::
6165

66+
"identity:list_users": "rule:admin_required or role:accounting"
6267

6368
Publishing benchmark information for OpenStack flavors (optional)
6469
-----------------------------------------------------------------
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
other:
3+
- |
4+
Keystone versions from Ussuri onwards (>= 17.0.0) implement a new policy.
5+
Please check the documentation so as to ensure that you are applying the
6+
correct changes.

releasenotes/notes/reno.cache

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
file-contents:
3+
releasenotes/notes/multi-region-support-4395450dfbc4e8a3.yaml:
4+
features:
5+
- "Add multi-region support in order to extract information from several \nregions\
6+
\ through different configuration files.\n"
7+
releasenotes/notes/new-release-notes-b79c3d7a778fc946.yaml:
8+
features:
9+
- 'New IP accounting record is implemented. Now cASO is able to extract IP
10+
11+
accounting and publish it using its JSON rendering. No new configuration
12+
13+
needs to be done, but the cASO user needs to have access to the Neutron
14+
15+
endpoints.
16+
17+
'
18+
- "cASO now allows to specity the projects to extract records from as project\n\
19+
IDs, rather than names. When dealing with different identity domains this\n\
20+
is troublesome, therefore we need to allow users to specify project IDs \nrather\
21+
\ than names.\n"
22+
fixes:
23+
- Define the correct entrypoints for the V2 and V4 messengers.
24+
- Generate LOG warnings when mappings cannot be found.
25+
prelude: 'Starting with this version cASO release notes are published within the
26+
documentation. This version is a major release that implements IP accounting
27+
record, as well as several bugfixes. There are no upgrade notes to take into
28+
account.
29+
30+
'
31+
releasenotes/notes/refactor-extractor-e826c64087e17065.yaml:
32+
prelude: 'This version includes a refactoring of the base extractors, dropping
33+
support for the ceilometer extractor that was unmaintained for a long period
34+
of time.
35+
36+
'
37+
upgrade:
38+
- 'Ceilometer extractor is no longer supported.
39+
40+
'
41+
notes:
42+
- files:
43+
- - releasenotes/notes/refactor-extractor-e826c64087e17065.yaml
44+
- !!binary |
45+
MmVkMDJjY2IwYTEyMDMyZmIxNjZkMTBlZGVhZmJmNmE5ZGJjMDZkZg==
46+
version: 2.1.0
47+
- files:
48+
- - releasenotes/notes/multi-region-support-4395450dfbc4e8a3.yaml
49+
- !!binary |
50+
OTY4NDYyYWNmOTQ0NTEyZGNlZmQ5MDJiNzI2ODc1ZTNmYjZmMzM5Mg==
51+
- - releasenotes/notes/new-release-notes-b79c3d7a778fc946.yaml
52+
- !!binary |
53+
NTNhM2RhMzhhM2Y2YjZjOTk4YTIwMTNmMjJkYzhiNTgyNDYyZWI1MQ==
54+
version: 2.0.0

0 commit comments

Comments
 (0)