Adds the config_template to heat

The change modifies the heat template tasks such that it's now
using the config_template action plugin. This change will make so that
config files can be dynamically updated, by a deployer, at run time,
without requiring the need to modify the in tree templates or defaults.

Partially implements: blueprint tunable-openstack-configuration

Change-Id: I53bb46f19fd61a5b320dbf0650433c5dd93b98fe

playbooks/roles/os_heat/defaults/main.yml

@@ -169,3 +169,11 @@ heat_service_names:
   - heat-api-cfn
   - heat-api-cloudwatch
   - heat-engine
+
+## Tunable overrides
+heat_heat_conf_overrides: {}
+heat_api_paste_ini_overrides: {}
+heat_default_yaml_overrides: {}
+heat_aws_cloudwatch_alarm_yaml_overrides: {}
+heat_aws_rds_dbinstance_yaml_overrides: {}
+heat_policy_overrides: {}

playbooks/roles/os_heat/tasks/heat_post_install.yml

@@ -13,44 +13,40 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Generate heat Config
+- name: Drop heat Config(s)
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: "{{ heat_system_user_name }}"
-    group: "{{ heat_system_group_name }}"
-  with_items:
-    - { src: "heat.conf.j2", dest: "/etc/heat/heat.conf" }
-    - { src: "api-paste.ini.j2", dest: "/etc/heat/api-paste.ini" }
-  notify:
-    - Restart heat services
-  tags:
-    - heat-config
-
-- name: Drop heat Configs
-  copy:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: "{{ heat_system_user_name }}"
-    group: "{{ heat_system_group_name }}"
-  with_items:
-    - { src: "environment.d/default.yaml", dest: "/etc/heat/environment.d/default.yaml" }
-    - { src: "templates/AWS_CloudWatch_Alarm.yaml", dest: "/etc/heat/templates/AWS_CloudWatch_Alarm.yaml" }
-    - { src: "templates/AWS_RDS_DBInstance.yaml", dest: "/etc/heat/templates/AWS_RDS_DBInstance.yaml" }
-  notify:
-    - Restart heat services
-  tags:
-    - heat-config
-
-- name: Apply updates to Policy file
   config_template:
-    src: "policy.json"
+    src: "{{ item.src }}"
-    dest: "/etc/heat/policy.json"
+    dest: "{{ item.dest }}"
     owner: "{{ heat_system_user_name }}"
     group: "{{ heat_system_group_name }}"
     mode: "0644"
-    config_overrides: "{{ heat_policy_overrides|default({}) }}"
+    config_overrides: "{{ item.config_overrides }}"
-    config_type: "json"
+    config_type: "{{ item.config_type }}"
+  with_items:
+    - src: "heat.conf.j2"
+      dest: "/etc/heat/heat.conf"
+      config_overrides: "{{ heat_heat_conf_overrides }}"
+      config_type: "ini"
+    - src: "api-paste.ini.j2"
+      dest: "/etc/heat/api-paste.ini"
+      config_overrides: "{{ heat_api_paste_ini_overrides }}"
+      config_type: "ini"
+    - src: "environment.d/default.yaml.j2"
+      dest: "/etc/heat/environment.d/default.yaml"
+      config_overrides: "{{ heat_default_yaml_overrides }}"
+      config_type: "yaml"
+    - src: "templates/AWS_CloudWatch_Alarm.yaml.j2"
+      dest: "/etc/heat/templates/AWS_CloudWatch_Alarm.yaml"
+      config_overrides: "{{ heat_aws_cloudwatch_alarm_yaml_overrides }}"
+      config_type: "yaml"
+    - src: "templates/AWS_RDS_DBInstance.yaml.j2"
+      dest: "/etc/heat/templates/AWS_RDS_DBInstance.yaml"
+      config_overrides: "{{ heat_aws_rds_dbinstance_yaml_overrides }}"
+      config_type: "yaml"
+    - src: "policy.json.j2"
+      dest: "/etc/heat/policy.json"
+      config_overrides: "{{ heat_policy_overrides }}"
+      config_type: "json"
   notify:
     - Restart heat services
   tags: