diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index 4b2057e2f9870f2675776db45e4a28e4aa252a5c..7df5f0426a0626531d84d792518426b6c2c0dfca 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -166,8 +166,6 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_iscsid | bool }}"
- regex: kafka
enabled: "{{ kolla_enable_kafka | bool }}"
- - regex: karbor
- enabled: "{{ kolla_enable_karbor | bool }}"
- regex: keepalived
enabled: "{{ kolla_enable_keepalived | bool }}"
- regex: keystone
@@ -493,7 +491,6 @@ kolla_enable_ironic_ipxe: "no"
kolla_enable_ironic: "no"
kolla_enable_ironic_neutron_agent: "{{ kolla_enable_neutron | bool and kolla_enable_ironic | bool }}"
kolla_enable_iscsid: "{{ (kolla_enable_cinder | bool and kolla_enable_cinder_backend_iscsi | bool) or kolla_enable_ironic | bool }}"
-kolla_enable_karbor: "no"
kolla_enable_kafka: "{{ kolla_enable_monasca | bool }}"
kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_monasca | bool else 'no' }}"
kolla_enable_kuryr: "no"
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index 445256b77efb4d89f7a21dcfbca5afc82a558aa3..4cd6c87921739213df47453d0191f30f773c0d69 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -53,9 +53,6 @@ monitoring
[kafka:children]
control
-[karbor:children]
-control
-
[kibana:children]
control
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
index 31d48c89f128a3bda780abfdbaa60c855b515885..3a5220a182fb5818c4b4eb51af926e5c193f5af9 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -145,16 +145,6 @@ ironic
[tgtd:children]
storage
-# Karbor
-[karbor-api:children]
-karbor
-
-[karbor-protection:children]
-karbor
-
-[karbor-operationengine:children]
-karbor
-
# Manila
[manila-api:children]
manila
diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml
index 70e0055dea40ca21794b92a5d0a1efc4a1e73136..d311a52ee5253a8441585cacd8a15bad1f0250cb 100644
--- a/ansible/roles/kolla-ansible/tests/test-extras.yml
+++ b/ansible/roles/kolla-ansible/tests/test-extras.yml
@@ -145,7 +145,6 @@
kolla_enable_ironic: True
kolla_enable_ironic_neutron_agent: True
kolla_enable_kafka: True
- kolla_enable_karbor: True
kolla_enable_kibana: True
kolla_enable_kuryr: True
kolla_enable_magnum: True
@@ -274,7 +273,6 @@
#enable_ironic: True
#enable_ironic_neutron_agent: True
#enable_kafka: True
- #enable_karbor: True
#enable_kibana: True
#enable_kuryr: True
#enable_magnum: True
diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index ab8ad2752748c9c9a4f0db398e3c294592b25f67..6e65875996d5c65489bed8b71de1082c0d964966 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -109,7 +109,6 @@ kolla_feature_flags:
- horizon_freezer
- horizon_heat
- horizon_ironic
- - horizon_karbor
- horizon_magnum
- horizon_manila
- horizon_masakari
@@ -133,7 +132,6 @@ kolla_feature_flags:
- ironic_pxe_uefi
- iscsid
- kafka
- - karbor
- keepalived
- keystone
- kibana
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index c5781b0779b4732528a1ec3492fcb39b221f8b01..f8f0a482cc946cc0f638c3b62dce7e757d815337 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -244,7 +244,6 @@
#kolla_enable_horizon_freezer:
#kolla_enable_horizon_heat:
#kolla_enable_horizon_ironic:
-#kolla_enable_horizon_karbor:
#kolla_enable_horizon_magnum:
#kolla_enable_horizon_manila:
#kolla_enable_horizon_masakari:
@@ -268,7 +267,6 @@
#kolla_enable_ironic_pxe_uefi:
#kolla_enable_iscsid:
#kolla_enable_kafka:
-#kolla_enable_karbor:
#kolla_enable_keepalived:
#kolla_enable_keystone:
#kolla_enable_kibana:
diff --git a/releasenotes/notes/remove-karbor-9d3bfad50490ec06.yaml b/releasenotes/notes/remove-karbor-9d3bfad50490ec06.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f329415567310a0100cec35feea8f5dcd5a025ed
--- /dev/null
+++ b/releasenotes/notes/remove-karbor-9d3bfad50490ec06.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+ - |
+ The Karbor project is no longer maintained and `retired since the Wallaby
+ cycle
+ <http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018643.html>`__.
+ Support for deployment of Karbor has been removed.
diff --git a/releasenotes/notes/remove-qinling-support-67635a37e620fc7b.yaml b/releasenotes/notes/remove-qinling-support-67635a37e620fc7b.yaml
index 59b7bb5b3ae9b436cdd17afad0e08a0bbbf48f96..de4aea0f295c8e5279c0b5a3a4115b90125c6cb4 100644
--- a/releasenotes/notes/remove-qinling-support-67635a37e620fc7b.yaml
+++ b/releasenotes/notes/remove-qinling-support-67635a37e620fc7b.yaml
@@ -1,7 +1,7 @@
upgrade:
- |
The ``Qinling`` project is no longer maintained and
- `retired since Wallaby cycle`__ . Its support is also removed
- since Wallaby cycle.
+ `retired since the Wallaby cycle`__ . Support for deployment of Qinling has
+ been removed.
__ http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018638.html
diff --git a/releasenotes/notes/remove-searchlight-support-a164fd550bfc14d4.yaml b/releasenotes/notes/remove-searchlight-support-a164fd550bfc14d4.yaml
index 03c740b5abe4b14c71d4968d14e5760836c55b57..360937e81cbca07d3ba28ec817e4c90eb93760cd 100644
--- a/releasenotes/notes/remove-searchlight-support-a164fd550bfc14d4.yaml
+++ b/releasenotes/notes/remove-searchlight-support-a164fd550bfc14d4.yaml
@@ -1,7 +1,7 @@
upgrade:
- |
The ``Searchlight`` project is no longer maintained and
- `retired since Wallaby cycle`__ . Its support is also
- removed since Wallaby cycle.
+ `retired since Wallaby cycle`__ . Support for deployment of Searchlight has
+ been removed.
__ http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018637.html