diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index b695b800d5..896a8caa9c 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -168,11 +168,6 @@ src: https://opendev.org/openstack/openstack-ansible-os_octavia version: master trackbranch: master -- name: os_panko - scm: git - src: https://opendev.org/openstack/openstack-ansible-os_panko - version: master - trackbranch: master - name: os_placement scm: git src: https://opendev.org/openstack/openstack-ansible-os_placement diff --git a/deploy-guide/source/configure.rst b/deploy-guide/source/configure.rst index 09776dd0c8..fbdefb86d7 100644 --- a/deploy-guide/source/configure.rst +++ b/deploy-guide/source/configure.rst @@ -162,8 +162,6 @@ OpenStack service roles - :role_docs:`os_octavia` -- :role_docs:`os_panko` - - :role_docs:`os_rally` - :role_docs:`os_sahara` diff --git a/doc/source/contributor/role-maturity-matrix.html b/doc/source/contributor/role-maturity-matrix.html index 134332f203..ab8b7b68e3 100644 --- a/doc/source/contributor/role-maturity-matrix.html +++ b/doc/source/contributor/role-maturity-matrix.html @@ -256,14 +256,6 @@ ✔ ✔ - - os_panko - Rocky - Incubated - ✔ - ✔ - ✘ - os_rally Newton @@ -442,4 +434,9 @@ os_watcher Queens Train + + + os_panko + Rocky + Xena diff --git a/etc/openstack_deploy/conf.d/panko.yml.aio b/etc/openstack_deploy/conf.d/panko.yml.aio deleted file mode 100644 index 003af0987e..0000000000 --- a/etc/openstack_deploy/conf.d/panko.yml.aio +++ /dev/null @@ -1,3 +0,0 @@ -event-infra_hosts: - aio1: - ip: 172.29.236.100 diff --git a/etc/openstack_deploy/conf.d/panko.yml.example b/etc/openstack_deploy/conf.d/panko.yml.example deleted file mode 100644 index 9f4b98a644..0000000000 --- a/etc/openstack_deploy/conf.d/panko.yml.example +++ /dev/null @@ -1,8 +0,0 @@ -# The infra nodes that will be running the event services -event-infra_hosts: - infra1: - ip: 172.20.236.111 - infra2: - ip: 172.20.236.112 - infra3: - ip: 172.20.236.113 diff --git a/etc/openstack_deploy/env.d/aio_metal.yml.example b/etc/openstack_deploy/env.d/aio_metal.yml.example index ec34717b3d..922ce9a419 100644 --- a/etc/openstack_deploy/env.d/aio_metal.yml.example +++ b/etc/openstack_deploy/env.d/aio_metal.yml.example @@ -102,9 +102,6 @@ container_skel: octavia_server_container: properties: is_metal: true - panko_container: - properties: - is_metal: true placement_container: properties: is_metal: true diff --git a/etc/openstack_deploy/user_secrets.yml b/etc/openstack_deploy/user_secrets.yml index f1d83edfb6..434f4c1cfc 100644 --- a/etc/openstack_deploy/user_secrets.yml +++ b/etc/openstack_deploy/user_secrets.yml @@ -287,10 +287,6 @@ tacker_container_mysql_password: ## Ceph RadosGW Keystone password radosgw_admin_password: -## panko passwords -panko_container_db_password: -panko_service_password: - ## manila passwords manila_container_mysql_password: manila_oslomsg_rpc_password: diff --git a/inventory/env.d/panko.yml b/inventory/env.d/panko.yml deleted file mode 100644 index 80e374fe26..0000000000 --- a/inventory/env.d/panko.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -# 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: - panko_api: - belongs_to: - - panko_all - -container_skel: - panko_container: - belongs_to: - - event-infra_containers - contains: - - panko_api - properties: - service_name: panko - -physical_skel: - event-infra_containers: - belongs_to: - - all_containers - event-infra_hosts: - belongs_to: - - hosts - - diff --git a/inventory/group_vars/haproxy/haproxy.yml b/inventory/group_vars/haproxy/haproxy.yml index cde21db9cd..f128e63fca 100644 --- a/inventory/group_vars/haproxy/haproxy.yml +++ b/inventory/group_vars/haproxy/haproxy.yml @@ -426,18 +426,10 @@ haproxy_ovn_ovsdb_service: - tcpka haproxy_service_enabled: "{{ (neutron_plugin_type == 'ml2.ovn') and (groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0) }}" +# TODO(noonedeadpunk): Remove that in Y release haproxy_panko_api_service: haproxy_service_name: panko_api - haproxy_backend_nodes: "{{ groups['panko_api'] | default([]) }}" - haproxy_ssl: "{{ haproxy_ssl }}" - haproxy_ssl_all_vips: "{{ haproxy_ssl_all_vips }}" - haproxy_port: 8777 - haproxy_balance_type: http - haproxy_backend_options: - - "forwardfor" - - "httpchk GET / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck" - - "httplog" - haproxy_service_enabled: "{{ groups['panko_all'] is defined and groups['panko_all'] | length > 0 }}" + state: absent haproxy_placement_service: haproxy_service_name: placement diff --git a/inventory/inventory.ini b/inventory/inventory.ini index 02c21d3774..6043bb06cf 100644 --- a/inventory/inventory.ini +++ b/inventory/inventory.ini @@ -222,10 +222,6 @@ nova_scheduler [octavia_all] -[panko_all:children] -panko_api -[panko_api] - [placement_all:children] placement_api [placement_api] diff --git a/playbooks/defaults/distro_install.yml b/playbooks/defaults/distro_install.yml index f14637ea9c..1aee723dd1 100644 --- a/playbooks/defaults/distro_install.yml +++ b/playbooks/defaults/distro_install.yml @@ -54,7 +54,6 @@ nova_install_method: distro nova_bin: /usr/bin octavia_install_method: distro octavia_bin: /usr/bin -panko_install_method: distro placement_install_method: distro rally_install_method: distro sahara_install_method: distro diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 280561dd44..4d33dbe382 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -278,12 +278,6 @@ octavia_git_install_branch: d10c9c2f9afacff8047a8005843483a07fe7472e # HEAD as o octavia_git_track_branch: master -## Panko service -panko_git_repo: https://opendev.org/openstack/panko -panko_git_install_branch: ca45bbdca049c6544cd9ece0d564ae7f20a1cd78 # HEAD as of 30.06.2021 -panko_git_track_branch: master - - ## Placement service placement_git_repo: https://opendev.org/openstack/placement placement_git_install_branch: f77a7f9928d1156450c48045c48597b2feec9cc1 # HEAD as of 30.06.2021 diff --git a/playbooks/os-panko-install.yml b/playbooks/os-panko-install.yml deleted file mode 100644 index 6a7df4a005..0000000000 --- a/playbooks/os-panko-install.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -# -# 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 panko facts - hosts: panko_all - gather_facts: "{{ osa_gather_facts | default(True) }}" - tags: - - always - -- name: Install the panko components - hosts: panko_all - gather_facts: false - user: root - environment: "{{ deployment_environment_variables | default({}) }}" - vars_files: - - "defaults/repo_packages/openstack_services.yml" - - "defaults/{{ install_method }}_install.yml" - tags: - - panko - pre_tasks: - - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" - tags: - - always - - - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - when: not is_metal - roles: - - role: "os_panko" diff --git a/playbooks/setup-openstack.yml b/playbooks/setup-openstack.yml index 046bacce7f..a5d1e37f14 100644 --- a/playbooks/setup-openstack.yml +++ b/playbooks/setup-openstack.yml @@ -29,7 +29,6 @@ - import_playbook: os-ceilometer-install.yml - import_playbook: os-aodh-install.yml - import_playbook: os-cloudkitty-install.yml -- import_playbook: os-panko-install.yml - import_playbook: os-ironic-install.yml - import_playbook: os-magnum-install.yml - import_playbook: os-trove-install.yml diff --git a/releasenotes/notes/dperecate_os_panko-0d2f6822ffc8fd43.yaml b/releasenotes/notes/dperecate_os_panko-0d2f6822ffc8fd43.yaml new file mode 100644 index 0000000000..6848acb2c7 --- /dev/null +++ b/releasenotes/notes/dperecate_os_panko-0d2f6822ffc8fd43.yaml @@ -0,0 +1,7 @@ +--- +deprecations: + - | + With the retirement of upstram Panko project, os_panko role has been + deprecated. Panko service API endpoint will be removed during upgrade. + If you want to preserve Panko API working, you should override + haproxy_panko_api_service. diff --git a/tests/roles/bootstrap-host/vars/main.yml b/tests/roles/bootstrap-host/vars/main.yml index 6f28f91fb3..10be065cf7 100644 --- a/tests/roles/bootstrap-host/vars/main.yml +++ b/tests/roles/bootstrap-host/vars/main.yml @@ -45,7 +45,7 @@ bootstrap_host_scenarios_expanded: |- {% set _ = scenario_list.extend(['heat']) %} {% endif %} {% if 'telemetry' in bootstrap_host_scenarios %} - {% set _ = scenario_list.extend(['aodh', 'ceilometer', 'gnocchi', 'panko']) %} + {% set _ = scenario_list.extend(['aodh', 'ceilometer', 'gnocchi']) %} {% endif %} {% if 'translations' in bootstrap_host_scenarios %} {% set _ = scenario_list.extend(['designate', 'heat', 'magnum', 'sahara', 'swift', 'trove']) %} diff --git a/tests/test_inventory.py b/tests/test_inventory.py index 37c3d75237..1291f792d1 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -223,9 +223,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'etcd_container', 'etcd_containers', 'etcd_hosts', - 'event-infra_all', - 'event-infra_containers', - 'event-infra_hosts', 'galera', 'galera_all', 'galera_container', @@ -349,9 +346,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'octavia-health-manager', 'octavia-infra_containers', 'octavia-infra_all', - 'panko_all', - 'panko_api', - 'panko_container', 'placement-infra_all', 'placement-infra_containers', 'placement-infra_hosts', diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 4317f270c6..0abc5ce32d 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -78,7 +78,6 @@ - name: openstack/openstack-ansible-os_neutron - name: openstack/openstack-ansible-os_nova - name: openstack/openstack-ansible-os_octavia - - name: openstack/openstack-ansible-os_panko - name: openstack/openstack-ansible-os_placement - name: openstack/openstack-ansible-os_rally - name: openstack/openstack-ansible-os_sahara @@ -101,8 +100,6 @@ - name: openstack/ansible-role-pki # OpenStack service repos - listed here to make cached repos available in CI - name: openstack/requirements - # OpenStack service repos - listed here as the corresponding OSA role cannot do distro install - - name: openstack/panko - job: name: openstack-ansible-deploy-aio @@ -147,7 +144,6 @@ - name: openstack/openstack-ansible-os_neutron - name: openstack/openstack-ansible-os_nova - name: openstack/openstack-ansible-os_octavia - - name: openstack/openstack-ansible-os_panko - name: openstack/openstack-ansible-os_placement - name: openstack/openstack-ansible-os_rally - name: openstack/openstack-ansible-os_sahara @@ -214,7 +210,6 @@ - name: openstack/trove - name: openstack/trove-dashboard - name: openstack/octavia - - name: openstack/panko - name: openstack/placement - name: openstack/tacker - name: openstack/octavia-dashboard