diff --git a/ansible/roles/kolla-ansible/defaults/main.yml b/ansible/roles/kolla-ansible/defaults/main.yml index e9a3e2ab2..588c69f90 100644 --- a/ansible/roles/kolla-ansible/defaults/main.yml +++ b/ansible/roles/kolla-ansible/defaults/main.yml @@ -248,7 +248,6 @@ kolla_openstack_logging_debug: #kolla_enable_cinder_backend_iscsi: #kolla_enable_cinder_backend_lvm: #kolla_enable_cloudkitty: -#kolla_enable_congress: #kolla_enable_etcd: #kolla_enable_gnocchi: #kolla_enable_grafana: diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 index 2e98a3f02..98d5b25db 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 @@ -177,9 +177,6 @@ control control compute -[congress:children] -control - [panko:children] control diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 index 49b27bfba..2f5aabb71 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 @@ -352,16 +352,6 @@ compute [cyborg-conductor:children] cyborg -# Congress -[congress-api:children] -congress - -[congress-datasource:children] -congress - -[congress-policy-engine:children] -congress - # Panko [panko-api:children] panko diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml index fc680cfee..cc643a8e2 100644 --- a/ansible/roles/kolla-ansible/tests/test-extras.yml +++ b/ansible/roles/kolla-ansible/tests/test-extras.yml @@ -157,7 +157,6 @@ kolla_enable_cinder_backend_lvm: True kolla_enable_cinder_backend_nfs: True kolla_enable_cloudkitty: True - kolla_enable_congress: True kolla_enable_designate: True kolla_enable_elasticsearch: True kolla_enable_etcd: True @@ -291,7 +290,6 @@ #enable_cinder_backend_lvm: True #enable_cinder_backend_nfs: True #enable_cloudkitty: True - #enable_congress: True #enable_designate: True #enable_elasticsearch: True #enable_etcd: True diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index 4a1bf1b4e..fcfc16fcd 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -90,7 +90,6 @@ kolla_feature_flags: - cinder_backup - cloudkitty - collectd - - congress - cyborg - designate - destroy_images @@ -106,7 +105,6 @@ kolla_feature_flags: - horizon - horizon_blazar - horizon_cloudkitty - - horizon_congress - horizon_designate - horizon_freezer - horizon_fwaas diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 8a342dee9..71e04c179 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -202,7 +202,6 @@ #kolla_enable_cinder_backup: #kolla_enable_cloudkitty: #kolla_enable_collectd: -#kolla_enable_congress: #kolla_enable_cyborg: #kolla_enable_designate: #kolla_enable_destroy_images: diff --git a/releasenotes/notes/remove-congress-support-0f6a327de69e2173.yaml b/releasenotes/notes/remove-congress-support-0f6a327de69e2173.yaml new file mode 100644 index 000000000..f829b844e --- /dev/null +++ b/releasenotes/notes/remove-congress-support-0f6a327de69e2173.yaml @@ -0,0 +1,7 @@ +upgrade: + - | + The ``congress`` project is no longer maintained. This has been + `retired since Victoria`__ and has not been used by other OpenStack + services since. + + __ http://lists.openstack.org/pipermail/openstack-discuss/2020-April/014292.html