diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index f3a35b28e..4b2057e2f 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -221,8 +221,6 @@ overcloud_container_image_regex_map: enabled: "{{ kolla_enable_prometheus | bool }}" - regex: qdrouterd enabled: "{{ kolla_enable_qdrouterd | bool }}" - - regex: qinling - enabled: "{{ kolla_enable_qinling | bool }}" - regex: rabbitmq enabled: "{{ kolla_enable_rabbitmq | bool }}" - regex: rally @@ -517,7 +515,6 @@ kolla_enable_panko: "no" kolla_enable_placement: "{{ kolla_enable_nova | bool or kolla_enable_zun | bool }}" kolla_enable_prometheus: "no" kolla_enable_qdrouterd: "no" -kolla_enable_qinling: "no" kolla_enable_rally: "no" kolla_enable_redis: "no" kolla_enable_sahara: "no" diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 index f7f0ecb39..445256b77 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 @@ -160,9 +160,6 @@ control [magnum:children] control -[qinling:children] -control - [sahara:children] control diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 index fa227d3a1..31d48c89f 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 @@ -280,13 +280,6 @@ magnum [magnum-conductor:children] magnum -# Qinling -[qinling-api:children] -qinling - -[qinling-engine:children] -qinling - # Sahara [sahara-api:children] sahara diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index c173753be..ab8ad2752 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -117,7 +117,6 @@ kolla_feature_flags: - horizon_murano - horizon_neutron_vpnaas - horizon_octavia - - horizon_qinling - horizon_sahara - horizon_senlin - horizon_solum @@ -181,7 +180,6 @@ kolla_feature_flags: - placement - prometheus - qdrouterd - - qinling - rabbitmq - rally - redis diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 23f0c42b3..c5781b077 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -252,7 +252,6 @@ #kolla_enable_horizon_murano: #kolla_enable_horizon_neutron_vpnaas: #kolla_enable_horizon_octavia: -#kolla_enable_horizon_qinling: #kolla_enable_horizon_sahara: #kolla_enable_horizon_senlin: #kolla_enable_horizon_solum: @@ -316,7 +315,6 @@ #kolla_enable_placement: #kolla_enable_prometheus: #kolla_enable_qdrouterd: -#kolla_enable_qinling: #kolla_enable_rabbitmq: #kolla_enable_rally: #kolla_enable_redis: diff --git a/releasenotes/notes/remove-qinling-support-67635a37e620fc7b.yaml b/releasenotes/notes/remove-qinling-support-67635a37e620fc7b.yaml new file mode 100644 index 000000000..59b7bb5b3 --- /dev/null +++ b/releasenotes/notes/remove-qinling-support-67635a37e620fc7b.yaml @@ -0,0 +1,7 @@ +upgrade: + - | + The ``Qinling`` project is no longer maintained and + `retired since Wallaby cycle`__ . Its support is also removed + since Wallaby cycle. + + __ http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018638.html