diff options
| author | Angus Salkeld <asalkeld@mirantis.com> | 2016-03-22 08:53:16 +1000 |
|---|---|---|
| committer | Angus Salkeld <asalkeld@mirantis.com> | 2016-03-22 08:53:29 +1000 |
| commit | d68644386f5c159ac646f70883ecf1349c153c76 (patch) | |
| tree | 001c17d675377f13fd8c0ffee18fda79d9d9d97a /ansible | |
| parent | 637f8f9ce5b4876a2febb2175bf3eb8f3c541c29 (diff) | |
| download | kolla-d68644386f5c159ac646f70883ecf1349c153c76.tar.gz kolla-d68644386f5c159ac646f70883ecf1349c153c76.zip | |
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
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/heat/tasks/config.yml | 7 | ||||
| -rw-r--r-- | ansible/roles/heat/templates/_deprecated.yaml | 4 | ||||
| -rw-r--r-- | ansible/roles/heat/templates/heat-engine.json.j2 | 6 |
3 files changed, 17 insertions, 0 deletions
diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml index 0bb0c4139..82c7e68cf 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 000000000..76cc8e387 --- /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 2cdaef365..19bf349e9 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" } ] } |