From fb24afca9e7b7cddc85a54e4ef0295111fb4b25b Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 25 Feb 2022 11:16:47 +0100 Subject: [PATCH] Drop vmtp This was removed from Kolla during the Yoga release cycle. Change-Id: I0d2fba4e23ba49dec5adc9a822af2afe09111b58 --- ansible/group_vars/all/kolla | 3 --- ansible/roles/kolla-ansible/templates/overcloud-components.j2 | 3 --- ansible/roles/kolla-ansible/vars/main.yml | 1 - etc/kayobe/kolla.yml | 1 - releasenotes/notes/drop-vmtp-ffb92c78669eb752.yaml | 4 ++++ 5 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/drop-vmtp-ffb92c78669eb752.yaml diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 984d12788..883b08fab 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -249,8 +249,6 @@ overcloud_container_image_regex_map: enabled: "{{ kolla_enable_trove | bool }}" - regex: ^vitrage enabled: "{{ kolla_enable_vitrage | bool }}" - - regex: ^vmtp - enabled: "{{ kolla_enable_vmtp | bool }}" - regex: ^watcher enabled: "{{ kolla_enable_watcher | bool }}" - regex: ^zookeeper @@ -573,7 +571,6 @@ kolla_enable_tacker: "no" kolla_enable_telegraf: "no" kolla_enable_trove: "no" kolla_enable_vitrage: "no" -kolla_enable_vmtp: "no" kolla_enable_watcher: "no" kolla_enable_zookeeper: "{{ kolla_enable_kafka | bool or kolla_enable_storm | bool }}" kolla_enable_zun: "no" diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 index e99a8f5ab..b5382a365 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 @@ -174,9 +174,6 @@ control [senlin:children] control -[vmtp:children] -control - [vitrage:children] control diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index 8c1612f9b..1f3fd0d5e 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -226,7 +226,6 @@ kolla_feature_flags: - trove_singletenant - vitrage - vitrage_prometheus_datasource - - vmtp - watcher - zookeeper - zun diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 45cabe12d..3ed09d6c8 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -410,7 +410,6 @@ #kolla_enable_trove_singletenant: #kolla_enable_vitrage: #kolla_enable_vitrage_prometheus_datasource: -#kolla_enable_vmtp: #kolla_enable_watcher: #kolla_enable_zookeeper: #kolla_enable_zun: diff --git a/releasenotes/notes/drop-vmtp-ffb92c78669eb752.yaml b/releasenotes/notes/drop-vmtp-ffb92c78669eb752.yaml new file mode 100644 index 000000000..2f5fadf74 --- /dev/null +++ b/releasenotes/notes/drop-vmtp-ffb92c78669eb752.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Removes support for deploying ``vmtp``, following its removal from Kolla.