From d68644386f5c159ac646f70883ecf1349c153c76 Mon Sep 17 00:00:00 2001
From: Angus Salkeld <asalkeld@mirantis.com>
Date: Tue, 22 Mar 2016 08:53:16 +1000
Subject: [PATCH] Disable deprecated heat plugins.
Note: you will get the following logs:
WARNING heat.engine.environment [] OS::Heat::HARestarter is DEPRECATED.
WARNING heat.engine.environment [] Removing OS::Heat::HARestarter from OS::Heat::HARestarter
Change-Id: I071e4689110ad03da14b02ba9f0a1fd8463b8b55
Closes-bug: 1559828
---
ansible/roles/heat/tasks/config.yml | 7 +++++++
ansible/roles/heat/templates/_deprecated.yaml | 4 ++++
ansible/roles/heat/templates/heat-engine.json.j2 | 6 ++++++
3 files changed, 17 insertions(+)
create mode 100644 ansible/roles/heat/templates/_deprecated.yaml
diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml
index 0bb0c4139d..82c7e68cf7 100644
--- a/ansible/roles/heat/tasks/config.yml
+++ b/ansible/roles/heat/tasks/config.yml
@@ -18,6 +18,13 @@
- "heat-api-cfn"
- "heat-engine"
+- name: Copying over the heat-engine environment file
+ template:
+ src: "_deprecated.yaml"
+ dest: "{{ node_config_directory }}/{{ item }}/_deprecated.yaml"
+ with_items:
+ - "heat-engine"
+
- name: Copying over heat.conf
merge_configs:
vars:
diff --git a/ansible/roles/heat/templates/_deprecated.yaml b/ansible/roles/heat/templates/_deprecated.yaml
new file mode 100644
index 0000000000..76cc8e387c
--- /dev/null
+++ b/ansible/roles/heat/templates/_deprecated.yaml
@@ -0,0 +1,4 @@
+resource_registry:
+ "OS::Heat::HARestarter":
+ "OS::Heat::SoftwareDeployments":
+ "OS::Heat::StructuredDeployments":
diff --git a/ansible/roles/heat/templates/heat-engine.json.j2 b/ansible/roles/heat/templates/heat-engine.json.j2
index 2cdaef3659..19bf349e99 100644
--- a/ansible/roles/heat/templates/heat-engine.json.j2
+++ b/ansible/roles/heat/templates/heat-engine.json.j2
@@ -6,6 +6,12 @@
"dest": "/etc/heat/heat.conf",
"owner": "heat",
"perm": "0600"
+ },
+ {
+ "source": "{{ container_config_directory }}/_deprecated.yaml",
+ "dest": "/etc/heat/environment.d/_deprecated.yaml",
+ "owner": "heat",
+ "perm": "0600"
}
]
}