commit d0e970b18ffe7f68cad7dcd395fc125b035ebc0d
author Filip Pytloun <filip@pytloun.cz> Thu May 18 14:57:20 2017 +0200
committer GitHub <noreply@github.com> Thu May 18 14:57:20 2017 +0200
tree 85bef79f0106ef0bc13e55dc3df069a8c7242e60
parent 2fa5224e792dcfc084a89e9d9cd2aa1b5a6e99dd
parent 2bb7cac9414908d050ca3e90d58302c9ee023200

Merge pull request #2 from dukov/master

Policy.json should be defined by user

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index c422fbe..a12d27d 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -14,6 +14,10 @@
   formula: ceilometer
   grains:
     noservices: True
+  dependencies:
+    - name: keystone
+      repo: git
+      source: https://github.com/salt-formulas/salt-formula-keystone
   state_top:
     base:
       "*":

README.rst

diff --git a/README.rst b/README.rst
index 86c8b78..cd83a5e 100644
--- a/README.rst
+++ b/README.rst
@@ -43,6 +43,18 @@
           password: pwd
           virtual_host: '/openstack'
 
+Configuration of policy.json file
+
+.. code-block:: yaml
+
+    ceilometer:
+      server:
+        ....
+        policy:
+          segregation: 'rule:context_is_admin'
+          # Add key without value to remove line from policy.json
+          'telemetry:get_resource':
+
 Databases configuration
 
 MongoDB example:

ceilometer/server.sls

diff --git a/ceilometer/server.sls b/ceilometer/server.sls
index 7f7e9de..e496bd9 100644
--- a/ceilometer/server.sls
+++ b/ceilometer/server.sls
@@ -12,6 +12,30 @@
   - require:
     - pkg: ceilometer_server_packages
 
+{%- for name, rule in server.get('policy', {}).iteritems() %}
+
+{%- if rule != None %}
+rule_{{ name }}_present:
+  keystone_policy.rule_present:
+  - path: /etc/ceilometer/policy.json
+  - name: {{ name }}
+  - rule: {{ rule }}
+  - require:
+    - pkg: ceilometer_server_packages
+
+{%- else %}
+
+rule_{{ name }}_absent:
+  keystone_policy.rule_absent:
+  - path: /etc/ceilometer/policy.json
+  - name: {{ name }}
+  - require:
+    - pkg: ceilometer_server_packages
+
+{%- endif %}
+
+{%- endfor %}
+
 {%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %}
 
 {%- if publisher_name != "default" %}

metadata.yml

diff --git a/metadata.yml b/metadata.yml
index ee39cb8..7f502d1 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,6 @@
 name: "ceilometer"
 version: "2016.4.1"
 source: "https://github.com/openstack/salt-formula-ceilometer"
+dependencies:
+  - name: keystone
+    source: "https://github.com/salt-formulas/salt-formula-keystone"

tests/pillar/server_cluster.sls

diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 0723a4d..52d5116 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -51,3 +51,6 @@
         enabled: true
         host: 127.0.0.1
         port: 8086
+      policy:
+        segregation: 'rule:context_is_admin'
+        'telemetry:get_resource':

tests/pillar/server_single.sls

diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index 444c399..7bf2790 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -41,3 +41,6 @@
         enabled: true
         host: 127.0.0.1
         port: 8086
+      policy:
+        segregation: 'rule:context_is_admin'
+        'telemetry:get_resource':