Merge "Rename state to avoid conflicting SLS IDs"
diff --git a/nova/controller.sls b/nova/controller.sls
index 528e0b0..88aa3c0 100644
--- a/nova/controller.sls
+++ b/nova/controller.sls
@@ -185,7 +185,7 @@
{%- for name, rule in controller.get('policy', {}).iteritems() %}
{%- if rule != None %}
-rule_{{ name }}_present:
+nova_keystone_rule_{{ name }}_present:
keystone_policy.rule_present:
- path: /etc/nova/policy.json
- name: {{ name }}
@@ -198,7 +198,7 @@
{%- else %}
-rule_{{ name }}_absent:
+nova_keystone_rule_{{ name }}_absent:
keystone_policy.rule_absent:
- path: /etc/nova/policy.json
- name: {{ name }}