diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml index 7195830bab..cf901bc59b 100644 --- a/ansible/roles/heat/tasks/config.yml +++ b/ansible/roles/heat/tasks/config.yml @@ -42,15 +42,6 @@ notify: - Restart {{ item.key }} container -- name: Copying over the heat-engine environment file - become: true - template: - src: "_deprecated.yaml" - dest: "{{ node_config_directory }}/{{ item }}/_deprecated.yaml" - mode: "0660" - with_items: - - "heat-engine" - - name: Copying over heat.conf become: true vars: diff --git a/ansible/roles/heat/tasks/upgrade.yml b/ansible/roles/heat/tasks/upgrade.yml index 20ccddc8f1..9e5ec40ff4 100644 --- a/ansible/roles/heat/tasks/upgrade.yml +++ b/ansible/roles/heat/tasks/upgrade.yml @@ -3,5 +3,12 @@ - include_tasks: bootstrap_service.yml +# NOTE(priteau): Remove this task in V cycle. +- name: Remove heat-engine environment file + become: true + file: + path: "{{ node_config_directory }}/heat-engine/_deprecated.yaml" + state: absent + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/heat/templates/_deprecated.yaml b/ansible/roles/heat/templates/_deprecated.yaml deleted file mode 100644 index 39bac77f33..0000000000 --- a/ansible/roles/heat/templates/_deprecated.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -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 e2bdb27738..abad7cb725 100644 --- a/ansible/roles/heat/templates/heat-engine.json.j2 +++ b/ansible/roles/heat/templates/heat-engine.json.j2 @@ -6,12 +6,6 @@ "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" }{% if heat_policy_file is defined %}, { "source": "{{ container_config_directory }}/{{ heat_policy_file }}", diff --git a/releasenotes/notes/remove-heat-engine-environment-file-5f1320011b00099d.yaml b/releasenotes/notes/remove-heat-engine-environment-file-5f1320011b00099d.yaml new file mode 100644 index 0000000000..f358487d25 --- /dev/null +++ b/releasenotes/notes/remove-heat-engine-environment-file-5f1320011b00099d.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + The Heat role has stopped disabling deprecated plugins. To apply this + change to existing deployments, the file + ```/etc/kolla/heat-engine/_deprecated.yaml`` is automatically removed + during the upgrade.