Merge "Rename state to avoid conflicting SLS IDs"
diff --git a/heat/server.sls b/heat/server.sls
index 5404fef..8d0c483 100644
--- a/heat/server.sls
+++ b/heat/server.sls
@@ -94,7 +94,7 @@
 {%- for name, rule in server.get('policy', {}).iteritems() %}
 
 {%- if rule != None %}
-rule_{{ name }}_present:
+heat_keystone_rule_{{ name }}_present:
   keystone_policy.rule_present:
   - path: /etc/heat/policy.json
   - name: {{ name }}
@@ -104,7 +104,7 @@
 
 {%- else %}
 
-rule_{{ name }}_absent:
+heat_keystone_rule_{{ name }}_absent:
   keystone_policy.rule_absent:
   - path: /etc/heat/policy.json
   - name: {{ name }}