diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 35ff7d7090..1da5cd3dd0 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -93,11 +93,6 @@ src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty version: master trackbranch: master -- name: os_congress - scm: git - src: https://opendev.org/openstack/openstack-ansible-os_congress - version: master - trackbranch: master - name: os_designate scm: git src: https://opendev.org/openstack/openstack-ansible-os_designate diff --git a/doc/source/contributor/role-maturity-matrix.html b/doc/source/contributor/role-maturity-matrix.html index 8d4187759a..b06171bfac 100644 --- a/doc/source/contributor/role-maturity-matrix.html +++ b/doc/source/contributor/role-maturity-matrix.html @@ -153,15 +153,6 @@ ✔ ✘ - - os_congress - Unknown - Unknown - ✘ - ✔ - ✘ - ✘ - os_designate Mitaka @@ -455,6 +446,11 @@ Queens Train + + os_congress + Unknown + Ussuri + os_monasca Ocata diff --git a/etc/openstack_deploy/conf.d/congress.yml.aio b/etc/openstack_deploy/conf.d/congress.yml.aio deleted file mode 100644 index c935150fc8..0000000000 --- a/etc/openstack_deploy/conf.d/congress.yml.aio +++ /dev/null @@ -1,4 +0,0 @@ ---- -policy_hosts: - aio1: - ip: 172.29.236.100 \ No newline at end of file diff --git a/etc/openstack_deploy/env.d/aio_metal.yml.example b/etc/openstack_deploy/env.d/aio_metal.yml.example index a0dec6db19..ec34717b3d 100644 --- a/etc/openstack_deploy/env.d/aio_metal.yml.example +++ b/etc/openstack_deploy/env.d/aio_metal.yml.example @@ -24,9 +24,6 @@ container_skel: cinder_volumes_container: properties: is_metal: true - congress_container: - properties: - is_metal: true designate_container: properties: is_metal: true diff --git a/etc/openstack_deploy/user_secrets.yml b/etc/openstack_deploy/user_secrets.yml index f06a842791..643593a886 100644 --- a/etc/openstack_deploy/user_secrets.yml +++ b/etc/openstack_deploy/user_secrets.yml @@ -268,16 +268,6 @@ tacker_container_mysql_password: ## Ceph RadosGW Keystone password radosgw_admin_password: -## Congress options -congress_container_mysql_password: -congress_oslomsg_rpc_password: -#NOTE: Please uncomment those -# if you want to split rpc and notify users -# Please also wire the appropriate userid in -# your user variables. -#congress_oslomsg_notify_password: -congress_service_password: - ## panko passwords panko_container_db_password: panko_service_password: diff --git a/inventory/env.d/congress.yml b/inventory/env.d/congress.yml deleted file mode 100644 index e72676f629..0000000000 --- a/inventory/env.d/congress.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -# Copyright 2017, taseer94@gmail.com -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -component_skel: - congress_server: - belongs_to: - - congress_all - - -container_skel: - congress_container: - belongs_to: - - policy_containers - contains: - - congress_server - - -physical_skel: - policy_containers: - belongs_to: - - all_containers - policy_hosts: - belongs_to: - - hosts diff --git a/inventory/group_vars/congress_all.yml b/inventory/group_vars/congress_all.yml deleted file mode 100644 index 1f9fdaaf2c..0000000000 --- a/inventory/group_vars/congress_all.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Copyright 2017, taseer94@gmail.com -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -congress_service_region: "{{ service_region }}" -congress_service_in_ldap: "{{ service_ldap_backend_enabled }}" - -# Ensure that the package state matches the global setting -congress_package_state: "{{ package_state }}" diff --git a/playbooks/defaults/distro_install.yml b/playbooks/defaults/distro_install.yml index de6186e765..8ef6605f10 100644 --- a/playbooks/defaults/distro_install.yml +++ b/playbooks/defaults/distro_install.yml @@ -31,7 +31,6 @@ ceilometer_install_method: distro cinder_install_method: distro cinder_bin: /usr/bin cloudkitty_install_method: distro -congress_install_method: distro designate_install_method: distro glance_install_method: distro glance_bin: /usr/bin diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 4cabc14921..2e69f95f43 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -304,13 +304,6 @@ tacker_git_project_group: tacker_all tacker_git_track_branch: master -## Congress service -congress_git_repo: https://opendev.org/openstack/congress -congress_git_install_branch: bba805af02f516b95650531afc02d1c60b1cd010 # HEAD as of 20.09.2020 -congress_git_package_name: openstack-congress -congress_git_project_group: congress_all -congress_git_track_branch: master - ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard octavia_dashboard_git_install_branch: 570c51b97d107b362e93d10f10a110558d9a81eb # HEAD as of 20.09.2020 diff --git a/playbooks/healthcheck-openstack.yml b/playbooks/healthcheck-openstack.yml index 6fd87955ac..bda2084b48 100644 --- a/playbooks/healthcheck-openstack.yml +++ b/playbooks/healthcheck-openstack.yml @@ -398,9 +398,6 @@ # Test os-tacker-install.yml # TO BE IMPLEMENTED -# Test os-congress-install.yml -# TO BE IMPLEMENTED - # Test os-tempest-install.yml # Tempest already has a test suite, so nothing should be added here. diff --git a/playbooks/os-congress-install.yml b/playbooks/os-congress-install.yml deleted file mode 100644 index b4b9fed222..0000000000 --- a/playbooks/os-congress-install.yml +++ /dev/null @@ -1,45 +0,0 @@ ---- -# Copyright 2017, taseer94@gmail.com -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Gather congress facts - hosts: congress_all - gather_facts: "{{ osa_gather_facts | default(True) }}" - tags: - - always - -- name: Install congress components - hosts: congress_all - gather_facts: false - max_fail_percentage: 20 - user: root - environment: "{{ deployment_environment_variables | default({}) }}" - vars_files: - - "defaults/repo_packages/openstack_services.yml" - - "defaults/{{ install_method }}_install.yml" - tags: - - congress - pre_tasks: - - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - when: not is_metal - - - include_tasks: common-tasks/unbound-clients.yml - when: - - hostvars['localhost']['resolvconf_enabled'] | bool - - roles: - - role: "os_congress" - - role: "system_crontab_coordination" - tags: - - crontab diff --git a/playbooks/setup-openstack.yml b/playbooks/setup-openstack.yml index 601fc260cc..441190bd21 100644 --- a/playbooks/setup-openstack.yml +++ b/playbooks/setup-openstack.yml @@ -45,6 +45,5 @@ # This is not an OpenStack service, but integrates with Keystone and must be # deployed afterward. - import_playbook: ceph-rgw-install.yml -- import_playbook: os-congress-install.yml - import_playbook: os-tempest-install.yml - import_playbook: os-rally-install.yml diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml index 3d20555021..5a32fff449 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml @@ -138,9 +138,6 @@ - src: user_variables_ceph.yml.j2 dest: user_variables_ceph.yml condition: "{{ 'ceph' in bootstrap_host_scenarios_expanded }}" - - src: user_variables_congress.yml.j2 - dest: user_variables_congress.yml - condition: "{{ 'congress' in bootstrap_host_scenarios_expanded }}" - src: user_variables_translations.yml.j2 dest: user_variables_translations.yml condition: "{{ 'translations' in bootstrap_host_scenarios_expanded }}" diff --git a/tests/roles/bootstrap-host/templates/user_variables_congress.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_congress.yml.j2 deleted file mode 100644 index 5766fa1820..0000000000 --- a/tests/roles/bootstrap-host/templates/user_variables_congress.yml.j2 +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2018, Taseer Ahmed -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -tempest_plugins: - - name: congress-tempest-plugin - repo: https://github.com/openstack/congress-tempest-plugin - branch: e8d68f8da9380aacdf05693aaf8bb9f8e570dd93 # HEAD of "master" as of 19.04.2018 - -tempest_whitelist: - - congress_tempest_plugin.tests.scenario.test_congress_basic_ops \ No newline at end of file diff --git a/tests/test_inventory.py b/tests/test_inventory.py index 0f488a573c..139723ab48 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -193,9 +193,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'compute_all', 'compute_containers', 'compute_hosts', - 'congress_all', - 'congress_container', - 'congress_server', 'dashboard_all', 'dashboard_containers', 'dashboard_hosts', @@ -354,9 +351,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'placement_all', 'placement_container', 'placement_api', - 'policy_all', - 'policy_containers', - 'policy_hosts', 'qemu-compute_containers', 'qemu-compute_hosts', 'reservation_all', diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index ed9ddd8103..3e3649f409 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -41,7 +41,6 @@ - name: openstack/openstack-ansible-os_blazar - name: openstack/openstack-ansible-os_ceilometer - name: openstack/openstack-ansible-os_cinder - - name: openstack/openstack-ansible-os_congress - name: openstack/openstack-ansible-os_designate - name: openstack/openstack-ansible-os_glance - name: openstack/openstack-ansible-os_gnocchi