openstack/kayobe
Code Issues Proposed changes

Merge "Remove retired Qinling support"

Browse Source
This commit is contained in:
Zuul 2020-12-19 03:37:31 +00:00 committed by Gerrit Code Review
commit e569036a05
6 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all/kolla
View File

@ -221,8 +221,6 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_prometheus | bool }}" enabled: "{{ kolla_enable_prometheus | bool }}"
- regex: qdrouterd - regex: qdrouterd
enabled: "{{ kolla_enable_qdrouterd | bool }}" enabled: "{{ kolla_enable_qdrouterd | bool }}"
- regex: qinling
enabled: "{{ kolla_enable_qinling | bool }}"
- regex: rabbitmq - regex: rabbitmq
enabled: "{{ kolla_enable_rabbitmq | bool }}" enabled: "{{ kolla_enable_rabbitmq | bool }}"
- regex: rally - regex: rally
@ -517,7 +515,6 @@ kolla_enable_panko: "no"
kolla_enable_placement: "{{ kolla_enable_nova | bool or kolla_enable_zun | bool }}" kolla_enable_placement: "{{ kolla_enable_nova | bool or kolla_enable_zun | bool }}"
kolla_enable_prometheus: "no" kolla_enable_prometheus: "no"
kolla_enable_qdrouterd: "no" kolla_enable_qdrouterd: "no"
kolla_enable_qinling: "no"
kolla_enable_rally: "no" kolla_enable_rally: "no"
kolla_enable_redis: "no" kolla_enable_redis: "no"
kolla_enable_sahara: "no" kolla_enable_sahara: "no"

3
ansible/roles/kolla-ansible/templates/overcloud-components.j2
View File

@ -160,9 +160,6 @@ control
[magnum:children] [magnum:children]
control control
[qinling:children]
control
[sahara:children] [sahara:children]
control control

7
ansible/roles/kolla-ansible/templates/overcloud-services.j2
View File

@ -280,13 +280,6 @@ magnum
[magnum-conductor:children] [magnum-conductor:children]
magnum magnum
# Qinling
[qinling-api:children]
qinling
[qinling-engine:children]
qinling
# Sahara # Sahara
[sahara-api:children] [sahara-api:children]
sahara sahara

2
ansible/roles/kolla-ansible/vars/main.yml
View File

@ -117,7 +117,6 @@ kolla_feature_flags:
- horizon_murano - horizon_murano
- horizon_neutron_vpnaas - horizon_neutron_vpnaas
- horizon_octavia - horizon_octavia
- horizon_qinling
- horizon_sahara - horizon_sahara
- horizon_senlin - horizon_senlin
- horizon_solum - horizon_solum
@ -181,7 +180,6 @@ kolla_feature_flags:
- placement - placement
- prometheus - prometheus
- qdrouterd - qdrouterd
- qinling
- rabbitmq - rabbitmq
- rally - rally
- redis - redis

2
etc/kayobe/kolla.yml
View File

@ -252,7 +252,6 @@
#kolla_enable_horizon_murano: #kolla_enable_horizon_murano:
#kolla_enable_horizon_neutron_vpnaas: #kolla_enable_horizon_neutron_vpnaas:
#kolla_enable_horizon_octavia: #kolla_enable_horizon_octavia:
#kolla_enable_horizon_qinling:
#kolla_enable_horizon_sahara: #kolla_enable_horizon_sahara:
#kolla_enable_horizon_senlin: #kolla_enable_horizon_senlin:
#kolla_enable_horizon_solum: #kolla_enable_horizon_solum:
@ -316,7 +315,6 @@
#kolla_enable_placement: #kolla_enable_placement:
#kolla_enable_prometheus: #kolla_enable_prometheus:
#kolla_enable_qdrouterd: #kolla_enable_qdrouterd:
#kolla_enable_qinling:
#kolla_enable_rabbitmq: #kolla_enable_rabbitmq:
#kolla_enable_rally: #kolla_enable_rally:
#kolla_enable_redis: #kolla_enable_redis:

7
releasenotes/notes/remove-qinling-support-67635a37e620fc7b.yaml Normal file
View File

@ -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