From af2544be54ba816ec1a12e5e083fd09f29df64fb Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 27 Oct 2025 09:09:50 +0100 Subject: [PATCH] Drop venus It has been marked as inactive and venus dashboard plugin is breaking Horizon Kolla builds. Change-Id: I78cf7a33bf1025f5c8e4b76ecfeef7d8a3126d61 Signed-off-by: Michal Nasiadka --- README.rst | 1 - ansible/group_vars/all/horizon.yml | 1 - ansible/group_vars/all/venus.yml | 10 - ansible/inventory/all-in-one | 9 - ansible/inventory/multinode | 9 - ansible/roles/cron/tasks/config.yml | 1 - .../templates/cron-logrotate-venus.conf.j2 | 3 - .../templates/conf/filter/01-rewrite.conf.j2 | 5 - ansible/roles/horizon/defaults/main.yml | 1 - ansible/roles/prometheus/defaults/main.yml | 4 - ansible/roles/venus/defaults/main.yml | 172 ------------------ ansible/roles/venus/handlers/main.yml | 28 --- ansible/roles/venus/tasks/bootstrap.yml | 38 ---- .../roles/venus/tasks/check-containers.yml | 3 - ansible/roles/venus/tasks/check.yml | 4 - ansible/roles/venus/tasks/clone.yml | 8 - ansible/roles/venus/tasks/config.yml | 65 ------- ansible/roles/venus/tasks/config_validate.yml | 7 - ansible/roles/venus/tasks/copy-certs.yml | 6 - .../roles/venus/tasks/deploy-containers.yml | 2 - ansible/roles/venus/tasks/deploy.yml | 14 -- ansible/roles/venus/tasks/loadbalancer.yml | 7 - ansible/roles/venus/tasks/main.yml | 2 - ansible/roles/venus/tasks/precheck.yml | 27 --- ansible/roles/venus/tasks/pull.yml | 3 - ansible/roles/venus/tasks/reconfigure.yml | 2 - ansible/roles/venus/tasks/register.yml | 7 - ansible/roles/venus/tasks/stop.yml | 6 - ansible/roles/venus/tasks/upgrade.yml | 7 - .../roles/venus/templates/venus-api.json.j2 | 25 --- .../venus/templates/venus-manager.json.j2 | 25 --- ansible/roles/venus/templates/venus.conf.j2 | 38 ---- ansible/roles/venus/vars/main.yml | 2 - ansible/site.yml | 21 --- etc/kolla/globals.yml | 2 - etc/kolla/passwords.yml | 3 - .../notes/drop-venus-b929071fb79b8026.yaml | 4 + tests/check-logs.sh | 3 - tests/run.yml | 9 +- tests/templates/globals-default.j2 | 6 - tests/templates/inventory.j2 | 9 - tests/test-venus.sh | 94 ---------- zuul.d/project.yaml | 1 - zuul.d/scenarios/venus.yaml | 43 ----- 44 files changed, 5 insertions(+), 732 deletions(-) delete mode 100644 ansible/group_vars/all/venus.yml delete mode 100644 ansible/roles/cron/templates/cron-logrotate-venus.conf.j2 delete mode 100644 ansible/roles/venus/defaults/main.yml delete mode 100644 ansible/roles/venus/handlers/main.yml delete mode 100644 ansible/roles/venus/tasks/bootstrap.yml delete mode 100644 ansible/roles/venus/tasks/check-containers.yml delete mode 100644 ansible/roles/venus/tasks/check.yml delete mode 100644 ansible/roles/venus/tasks/clone.yml delete mode 100644 ansible/roles/venus/tasks/config.yml delete mode 100644 ansible/roles/venus/tasks/config_validate.yml delete mode 100644 ansible/roles/venus/tasks/copy-certs.yml delete mode 100644 ansible/roles/venus/tasks/deploy-containers.yml delete mode 100644 ansible/roles/venus/tasks/deploy.yml delete mode 100644 ansible/roles/venus/tasks/loadbalancer.yml delete mode 100644 ansible/roles/venus/tasks/main.yml delete mode 100644 ansible/roles/venus/tasks/precheck.yml delete mode 100644 ansible/roles/venus/tasks/pull.yml delete mode 100644 ansible/roles/venus/tasks/reconfigure.yml delete mode 100644 ansible/roles/venus/tasks/register.yml delete mode 100644 ansible/roles/venus/tasks/stop.yml delete mode 100644 ansible/roles/venus/tasks/upgrade.yml delete mode 100644 ansible/roles/venus/templates/venus-api.json.j2 delete mode 100644 ansible/roles/venus/templates/venus-manager.json.j2 delete mode 100644 ansible/roles/venus/templates/venus.conf.j2 delete mode 100644 ansible/roles/venus/vars/main.yml create mode 100644 releasenotes/notes/drop-venus-b929071fb79b8026.yaml delete mode 100755 tests/test-venus.sh delete mode 100644 zuul.d/scenarios/venus.yaml diff --git a/README.rst b/README.rst index 6a1ccf9620..4ee2c7dd04 100644 --- a/README.rst +++ b/README.rst @@ -64,7 +64,6 @@ Kolla Ansible deploys containers for the following OpenStack projects: - Skyline (`APIServer `__ and `Console `__) - `Tacker `__ - `Trove `__ -- `Venus `__ - `Watcher `__ - `Zun `__ diff --git a/ansible/group_vars/all/horizon.yml b/ansible/group_vars/all/horizon.yml index fcab934b25..8e477ad9c1 100644 --- a/ansible/group_vars/all/horizon.yml +++ b/ansible/group_vars/all/horizon.yml @@ -14,7 +14,6 @@ enable_horizon_neutron_vpnaas: "{{ enable_neutron_vpnaas | bool }}" enable_horizon_octavia: "{{ enable_octavia | bool }}" enable_horizon_tacker: "{{ enable_tacker | bool }}" enable_horizon_trove: "{{ enable_trove | bool }}" -enable_horizon_venus: "{{ enable_venus | bool }}" enable_horizon_watcher: "{{ enable_watcher | bool }}" enable_horizon_zun: "{{ enable_zun | bool }}" diff --git a/ansible/group_vars/all/venus.yml b/ansible/group_vars/all/venus.yml deleted file mode 100644 index 85908647b1..0000000000 --- a/ansible/group_vars/all/venus.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -enable_venus: "no" - -venus_internal_fqdn: "{{ kolla_internal_fqdn }}" -venus_external_fqdn: "{{ kolla_external_fqdn }}" -venus_internal_endpoint: "{{ venus_internal_fqdn | kolla_url(internal_protocol, venus_api_port) }}" -venus_public_endpoint: "{{ venus_external_fqdn | kolla_url(public_protocol, venus_api_public_port) }}" -venus_api_port: "10010" -venus_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else venus_api_port }}" -venus_api_listen_port: "{{ venus_api_port }}" diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one index 1d47ec7982..6ab9227f5b 100644 --- a/ansible/inventory/all-in-one +++ b/ansible/inventory/all-in-one @@ -165,9 +165,6 @@ control [blazar:children] control -[venus:children] -monitoring - [letsencrypt:children] loadbalancer @@ -590,12 +587,6 @@ ovn-database [ovn-sb-db-relay:children] ovn-database -[venus-api:children] -venus - -[venus-manager:children] -venus - [letsencrypt-webserver:children] letsencrypt diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index 9c35be0475..972e4059e5 100644 --- a/ansible/inventory/multinode +++ b/ansible/inventory/multinode @@ -183,9 +183,6 @@ control [blazar:children] control -[venus:children] -monitoring - [letsencrypt:children] loadbalancer @@ -608,12 +605,6 @@ ovn-database [ovn-sb-db-relay:children] ovn-database -[venus-api:children] -venus - -[venus-manager:children] -venus - [letsencrypt-webserver:children] letsencrypt diff --git a/ansible/roles/cron/tasks/config.yml b/ansible/roles/cron/tasks/config.yml index adb5bfe5ef..e1a5e30e90 100644 --- a/ansible/roles/cron/tasks/config.yml +++ b/ansible/roles/cron/tasks/config.yml @@ -75,7 +75,6 @@ - { name: "skyline", enabled: "{{ enable_skyline | bool }}" } - { name: "tacker", enabled: "{{ enable_tacker | bool }}" } - { name: "trove", enabled: "{{ enable_trove | bool }}" } - - { name: "venus", enabled: "{{ enable_venus | bool }}" } - { name: "watcher", enabled: "{{ enable_watcher | bool }}" } - { name: "zun", enabled: "{{ enable_zun | bool }}" } template: diff --git a/ansible/roles/cron/templates/cron-logrotate-venus.conf.j2 b/ansible/roles/cron/templates/cron-logrotate-venus.conf.j2 deleted file mode 100644 index 5ff3c425a7..0000000000 --- a/ansible/roles/cron/templates/cron-logrotate-venus.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/venus/*.log" -{ -} diff --git a/ansible/roles/fluentd/templates/conf/filter/01-rewrite.conf.j2 b/ansible/roles/fluentd/templates/conf/filter/01-rewrite.conf.j2 index c8e35c8598..66a1897a20 100644 --- a/ansible/roles/fluentd/templates/conf/filter/01-rewrite.conf.j2 +++ b/ansible/roles/fluentd/templates/conf/filter/01-rewrite.conf.j2 @@ -136,11 +136,6 @@ pattern ^(masakari-engine|masakari-api)$ tag openstack_python - - key programname - pattern ^(venus-api|venus-manager)$ - tag openstack_python - key programname pattern ^(skyline)$ diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml index d1dcae651f..01a6e3082a 100644 --- a/ansible/roles/horizon/defaults/main.yml +++ b/ansible/roles/horizon/defaults/main.yml @@ -20,7 +20,6 @@ horizon_services: ENABLE_OCTAVIA: "{{ 'yes' if enable_horizon_octavia | bool else 'no' }}" ENABLE_TACKER: "{{ 'yes' if enable_horizon_tacker | bool else 'no' }}" ENABLE_TROVE: "{{ 'yes' if enable_horizon_trove | bool else 'no' }}" - ENABLE_VENUS: "{{ 'yes' if enable_horizon_venus | bool else 'no' }}" ENABLE_WATCHER: "{{ 'yes' if enable_horizon_watcher | bool else 'no' }}" ENABLE_ZUN: "{{ 'yes' if enable_horizon_zun | bool else 'no' }}" FORCE_GENERATE: "{{ 'yes' if horizon_dev_mode | bool else 'no' }}" diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml index 883fdce2fe..27affe4472 100644 --- a/ansible/roles/prometheus/defaults/main.yml +++ b/ansible/roles/prometheus/defaults/main.yml @@ -286,10 +286,6 @@ prometheus_blackbox_exporter_endpoints_default: - "trove:os_endpoint:{{ trove_public_base_endpoint }}" - "{{ ('trove_internal:os_endpoint:' + trove_internal_base_endpoint) if not kolla_same_external_internal_vip | bool }}" enabled: "{{ enable_trove | bool }}" - - endpoints: - - "venus:os_endpoint:{{ venus_public_endpoint }}" - - "{{ ('venus_internal:os_endpoint:' + venus_internal_endpoint) if not kolla_same_external_internal_vip | bool }}" - enabled: "{{ enable_venus | bool }}" - endpoints: - "watcher:os_endpoint:{{ watcher_public_endpoint }}" - "{{ ('watcher_internal:os_endpoint:' + watcher_internal_endpoint) if not kolla_same_external_internal_vip | bool }}" diff --git a/ansible/roles/venus/defaults/main.yml b/ansible/roles/venus/defaults/main.yml deleted file mode 100644 index 2677cb5263..0000000000 --- a/ansible/roles/venus/defaults/main.yml +++ /dev/null @@ -1,172 +0,0 @@ ---- -venus_services: - venus-api: - container_name: venus_api - group: venus-api - enabled: true - image: "{{ venus_api_image_full }}" - volumes: "{{ venus_api_default_volumes + venus_api_extra_volumes }}" - dimensions: "{{ venus_api_dimensions }}" - healthcheck: "{{ venus_api_healthcheck }}" - haproxy: - venus_api: - enabled: "{{ enable_venus }}" - mode: "http" - external: false - port: "{{ venus_api_port }}" - backend_http_extra: - - "option httpchk" - venus_api_external: - enabled: "{{ enable_venus }}" - mode: "http" - external: true - external_fqdn: "{{ venus_external_fqdn }}" - port: "{{ venus_api_public_port }}" - backend_http_extra: - - "option httpchk" - venus-manager: - container_name: venus_manager - group: venus-manager - enabled: true - image: "{{ venus_manager_image_full }}" - volumes: "{{ venus_manager_default_volumes + venus_manager_extra_volumes }}" - dimensions: "{{ venus_manager_dimensions }}" - -#################### -# Config Validate -#################### -venus_config_validation: - - generator: "/venus/tools/config/venus-config-generator.conf" - config: "/etc/venus/venus.conf" - -#################### -# Database -#################### -venus_database_name: "venus" -venus_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}venus{% endif %}" -venus_database_address: "{{ database_address | put_address_in_context('url') }}:{{ database_port }}" - -#################### -# Database sharding -#################### -venus_database_shard_root_user: "{% if enable_proxysql | bool %}root_shard_{{ venus_database_shard_id }}{% else %}{{ database_user }}{% endif %}" -venus_database_shard_id: "{{ mariadb_default_database_shard_id | int }}" -venus_database_shard: - users: - - user: "{{ venus_database_user }}" - password: "{{ venus_database_password }}" - shard_id: "{{ venus_database_shard_id }}" - rules: - - schema: "{{ venus_database_name }}" - shard_id: "{{ venus_database_shard_id }}" - - user: "{{ venus_database_user }}" - shard_id: "{{ venus_database_shard_id }}" - - -#################### -# Docker -#################### -venus_tag: "{{ openstack_tag }}" - -venus_api_image: "{{ docker_image_url }}venus-api" -venus_api_tag: "{{ venus_tag }}" -venus_api_image_full: "{{ venus_api_image }}:{{ venus_api_tag }}" - -venus_manager_image: "{{ docker_image_url }}venus-manager" -venus_manager_tag: "{{ venus_tag }}" -venus_manager_image_full: "{{ venus_manager_image }}:{{ venus_manager_tag }}" - -venus_api_dimensions: "{{ default_container_dimensions }}" -venus_manager_dimensions: "{{ default_container_dimensions }}" - -venus_api_enable_healthchecks: "{{ enable_container_healthchecks }}" -venus_api_healthcheck_interval: "{{ default_container_healthcheck_interval }}" -venus_api_healthcheck_retries: "{{ default_container_healthcheck_retries }}" -venus_api_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}" -venus_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl http://{{ api_interface_address | put_address_in_context('url') }}:{{ venus_api_port }}"] -venus_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}" -venus_api_healthcheck: - interval: "{{ venus_api_healthcheck_interval }}" - retries: "{{ venus_api_healthcheck_retries }}" - start_period: "{{ venus_api_healthcheck_start_period }}" - test: "{% if venus_api_enable_healthchecks | bool %}{{ venus_api_healthcheck_test }}{% else %}NONE{% endif %}" - timeout: "{{ venus_api_healthcheck_timeout }}" - -venus_api_default_volumes: - - "{{ node_config_directory }}/venus-api/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - - "kolla_logs:/var/log/kolla/" - - "{{ '/dev/shm:/dev/shm' }}" - - "{{ kolla_dev_repos_directory ~ '/venus:/dev-mode/venus' if venus_dev_mode | bool else '' }}" - - "venus:/var/lib/venus/" -venus_manager_default_volumes: - - "{{ node_config_directory }}/venus-manager/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - - "kolla_logs:/var/log/kolla/" - - "{{ '/dev/shm:/dev/shm' }}" - - "{{ kolla_dev_repos_directory ~ '/venus:/dev-mode/venus' if venus_dev_mode | bool else '' }}" - - "venus:/var/lib/venus/" - -venus_extra_volumes: "{{ default_extra_volumes }}" -venus_api_extra_volumes: "{{ venus_extra_volumes }}" -venus_manager_extra_volumes: "{{ venus_extra_volumes }}" - -#################### -# OpenStack -#################### -venus_logging_debug: "{{ openstack_logging_debug }}" - -venus_keystone_user: "venus" - -openstack_venus_auth: "{{ openstack_auth }}" - - -#################### -# Kolla -#################### -venus_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}" -venus_dev_repos_pull: "{{ kolla_dev_repos_pull }}" -venus_dev_mode: "{{ kolla_dev_mode }}" -venus_source_version: "{{ kolla_source_version }}" - -#################### -# logging -#################### -openstack_logging_default_format_string: "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [- req-None - - - - -] %(instance)s%(message)s" -openstack_logging_context_format_string: "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(global_request_id)s %(request_id)s %(user_identity)s] %(instance)s%(message)s" - -#################### -# Notifications -#################### -venus_notification_topics: - - name: notifications - enabled: "{{ enable_ceilometer | bool }}" - -venus_enabled_notification_topics: "{{ venus_notification_topics | selectattr('enabled', 'equalto', true) | list }}" - -#################### -# Keystone -#################### -venus_ks_services: - - name: "venus" - type: "LMS" - description: "Log Manager Service" - endpoints: - - {'interface': 'internal', 'url': '{{ venus_internal_endpoint }}'} - - {'interface': 'public', 'url': '{{ venus_public_endpoint }}'} - -venus_ks_users: - - project: "service" - user: "{{ venus_keystone_user }}" - password: "{{ venus_keystone_password }}" - role: "admin" - -# Database -venus_database_enable_tls_internal: "{{ database_enable_tls_internal | bool }}" - -################### -# Copy certificates -################### -venus_copy_certs: "{{ kolla_copy_ca_into_containers | bool or venus_database_enable_tls_internal | bool }}" diff --git a/ansible/roles/venus/handlers/main.yml b/ansible/roles/venus/handlers/main.yml deleted file mode 100644 index 1f8b3fdb50..0000000000 --- a/ansible/roles/venus/handlers/main.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- name: Restart venus-api container - vars: - service_name: "venus-api" - service: "{{ venus_services[service_name] }}" - become: true - kolla_container: - action: "recreate_or_restart_container" - common_options: "{{ docker_common_options }}" - name: "{{ service.container_name }}" - image: "{{ service.image }}" - volumes: "{{ service.volumes | reject('equalto', '') | list }}" - dimensions: "{{ service.dimensions }}" - healthcheck: "{{ service.healthcheck | default(omit) }}" - -- name: Restart venus-manager container - vars: - service_name: "venus-manager" - service: "{{ venus_services[service_name] }}" - become: true - kolla_container: - action: "recreate_or_restart_container" - common_options: "{{ docker_common_options }}" - name: "{{ service.container_name }}" - image: "{{ service.image }}" - volumes: "{{ service.volumes | reject('equalto', '') | list }}" - dimensions: "{{ service.dimensions }}" - healthcheck: "{{ service.healthcheck | default(omit) }}" diff --git a/ansible/roles/venus/tasks/bootstrap.yml b/ansible/roles/venus/tasks/bootstrap.yml deleted file mode 100644 index 57938e60f1..0000000000 --- a/ansible/roles/venus/tasks/bootstrap.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- name: Creating venus database - become: true - kolla_toolbox: - container_engine: "{{ kolla_container_engine }}" - module_name: mysql_db - module_args: - ca_cert: "{{ openstack_cacert if database_enable_tls_internal | bool else omit }}" - login_host: "{{ database_address }}" - login_port: "{{ database_port }}" - login_user: "{{ venus_database_shard_root_user }}" - login_password: "{{ database_password }}" - name: "{{ venus_database_name }}" - run_once: True - delegate_to: "{{ groups['venus-api'][0] }}" - when: - - not use_preconfigured_databases | bool - -- name: Creating venus database user and setting permissions - become: true - kolla_toolbox: - container_engine: "{{ kolla_container_engine }}" - module_name: mysql_user - module_args: - ca_cert: "{{ openstack_cacert if database_enable_tls_internal | bool else omit }}" - login_host: "{{ database_address }}" - login_port: "{{ database_port }}" - login_user: "{{ venus_database_shard_root_user }}" - login_password: "{{ database_password }}" - name: "{{ venus_database_user }}" - password: "{{ venus_database_password }}" - host: "%" - priv: "{{ venus_database_name }}.*:ALL" - append_privs: "yes" - run_once: True - delegate_to: "{{ groups['venus-api'][0] }}" - when: - - not use_preconfigured_databases | bool diff --git a/ansible/roles/venus/tasks/check-containers.yml b/ansible/roles/venus/tasks/check-containers.yml deleted file mode 100644 index b7e2f7c29f..0000000000 --- a/ansible/roles/venus/tasks/check-containers.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- import_role: - name: service-check-containers diff --git a/ansible/roles/venus/tasks/check.yml b/ansible/roles/venus/tasks/check.yml deleted file mode 100644 index 63d29a6f31..0000000000 --- a/ansible/roles/venus/tasks/check.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: Checking Venus containers - import_role: - role: service-check diff --git a/ansible/roles/venus/tasks/clone.yml b/ansible/roles/venus/tasks/clone.yml deleted file mode 100644 index 4d85cc0e80..0000000000 --- a/ansible/roles/venus/tasks/clone.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Cloning venus source repository for development - become: true - git: - repo: "{{ venus_git_repository }}" - dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}" - update: "{{ venus_dev_repos_pull }}" - version: "{{ venus_source_version }}" diff --git a/ansible/roles/venus/tasks/config.yml b/ansible/roles/venus/tasks/config.yml deleted file mode 100644 index 28b9ee80f5..0000000000 --- a/ansible/roles/venus/tasks/config.yml +++ /dev/null @@ -1,65 +0,0 @@ ---- -- name: Ensuring config directories exist - file: - path: "{{ node_config_directory }}/{{ item.key }}" - state: "directory" - owner: "{{ config_owner_user }}" - group: "{{ config_owner_group }}" - mode: "0770" - become: true - with_dict: "{{ venus_services | select_services_enabled_and_mapped_to_host }}" - -- name: Check if policies shall be overwritten - stat: - path: "{{ item }}" - run_once: True - delegate_to: localhost - register: venus_policy - with_first_found: - - files: "{{ supported_policy_format_list }}" - paths: - - "{{ node_custom_config }}/venus/" - skip: true - -- name: Set venus policy file - set_fact: - venus_policy_file: "{{ venus_policy.results.0.stat.path | basename }}" - venus_policy_file_path: "{{ venus_policy.results.0.stat.path }}" - when: - - venus_policy.results | length > 0 - -- include_tasks: copy-certs.yml - when: - - venus_copy_certs | bool - -- name: Copying over config.json files for services - template: - src: "{{ item.key }}.json.j2" - dest: "{{ node_config_directory }}/{{ item.key }}/config.json" - mode: "0660" - become: true - with_dict: "{{ venus_services | select_services_enabled_and_mapped_to_host }}" - -- name: Copying over venus.conf - vars: - service_name: "{{ item.key }}" - merge_configs: - sources: - - "{{ role_path }}/templates/venus.conf.j2" - - "{{ node_custom_config }}/global.conf" - - "{{ node_custom_config }}/venus.conf" - - "{{ node_custom_config }}/venus/{{ item.key }}.conf" - - "{{ node_custom_config }}/venus/{{ inventory_hostname }}/venus.conf" - dest: "{{ node_config_directory }}/{{ item.key }}/venus.conf" - mode: "0660" - become: true - with_dict: "{{ venus_services | select_services_enabled_and_mapped_to_host }}" - -- name: Copying over existing policy file - template: - src: "{{ venus_policy_file_path }}" - dest: "{{ node_config_directory }}/{{ item.key }}/{{ venus_policy_file }}" - mode: "0660" - when: - - venus_policy_file is defined - with_dict: "{{ venus_services | select_services_enabled_and_mapped_to_host }}" diff --git a/ansible/roles/venus/tasks/config_validate.yml b/ansible/roles/venus/tasks/config_validate.yml deleted file mode 100644 index 57ab862017..0000000000 --- a/ansible/roles/venus/tasks/config_validate.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- import_role: - name: service-config-validate - vars: - service_config_validate_services: "{{ venus_services }}" - service_name: "{{ project_name }}" - service_config_validation: "{{ venus_config_validation }}" diff --git a/ansible/roles/venus/tasks/copy-certs.yml b/ansible/roles/venus/tasks/copy-certs.yml deleted file mode 100644 index c0452d546e..0000000000 --- a/ansible/roles/venus/tasks/copy-certs.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: "Copy certificates and keys for {{ project_name }}" - import_role: - role: service-cert-copy - vars: - project_services: "{{ venus_services }}" diff --git a/ansible/roles/venus/tasks/deploy-containers.yml b/ansible/roles/venus/tasks/deploy-containers.yml deleted file mode 100644 index eb24ab5c7a..0000000000 --- a/ansible/roles/venus/tasks/deploy-containers.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- import_tasks: check-containers.yml diff --git a/ansible/roles/venus/tasks/deploy.yml b/ansible/roles/venus/tasks/deploy.yml deleted file mode 100644 index b9775dda85..0000000000 --- a/ansible/roles/venus/tasks/deploy.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- import_tasks: register.yml - -- import_tasks: config.yml - -- import_tasks: check-containers.yml - -- include_tasks: clone.yml - when: venus_dev_mode | bool - -- import_tasks: bootstrap.yml - -- name: Flush handlers - meta: flush_handlers diff --git a/ansible/roles/venus/tasks/loadbalancer.yml b/ansible/roles/venus/tasks/loadbalancer.yml deleted file mode 100644 index b692351e63..0000000000 --- a/ansible/roles/venus/tasks/loadbalancer.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: "Configure loadbalancer for {{ project_name }}" - import_role: - name: loadbalancer-config - vars: - project_services: "{{ venus_services }}" - tags: always diff --git a/ansible/roles/venus/tasks/main.yml b/ansible/roles/venus/tasks/main.yml deleted file mode 100644 index bc5d1e6257..0000000000 --- a/ansible/roles/venus/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/venus/tasks/precheck.yml b/ansible/roles/venus/tasks/precheck.yml deleted file mode 100644 index 10408219d1..0000000000 --- a/ansible/roles/venus/tasks/precheck.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- import_role: - name: service-precheck - vars: - service_precheck_services: "{{ venus_services }}" - service_name: "{{ project_name }}" - -- name: Get container facts - become: true - kolla_container_facts: - action: get_containers - container_engine: "{{ kolla_container_engine }}" - name: - - venus_api - check_mode: false - register: container_facts - -- name: Checking free port for Venus API - wait_for: - host: "{{ api_interface_address }}" - port: "{{ venus_api_port }}" - connect_timeout: 1 - timeout: 1 - state: stopped - when: - - container_facts.containers['venus_api'] is not defined - - inventory_hostname in groups['venus-api'] diff --git a/ansible/roles/venus/tasks/pull.yml b/ansible/roles/venus/tasks/pull.yml deleted file mode 100644 index 53f9c5fda1..0000000000 --- a/ansible/roles/venus/tasks/pull.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- import_role: - role: service-images-pull diff --git a/ansible/roles/venus/tasks/reconfigure.yml b/ansible/roles/venus/tasks/reconfigure.yml deleted file mode 100644 index 5b10a7e111..0000000000 --- a/ansible/roles/venus/tasks/reconfigure.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- import_tasks: deploy.yml diff --git a/ansible/roles/venus/tasks/register.yml b/ansible/roles/venus/tasks/register.yml deleted file mode 100644 index d61d9a9b0c..0000000000 --- a/ansible/roles/venus/tasks/register.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- import_role: - name: service-ks-register - vars: - service_ks_register_auth: "{{ openstack_venus_auth }}" - service_ks_register_services: "{{ venus_ks_services }}" - service_ks_register_users: "{{ venus_ks_users }}" diff --git a/ansible/roles/venus/tasks/stop.yml b/ansible/roles/venus/tasks/stop.yml deleted file mode 100644 index 5016a76343..0000000000 --- a/ansible/roles/venus/tasks/stop.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- import_role: - name: service-stop - vars: - project_services: "{{ venus_services }}" - service_name: "{{ project_name }}" diff --git a/ansible/roles/venus/tasks/upgrade.yml b/ansible/roles/venus/tasks/upgrade.yml deleted file mode 100644 index 49edff81e3..0000000000 --- a/ansible/roles/venus/tasks/upgrade.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- import_tasks: config.yml - -- import_tasks: check-containers.yml - -- name: Flush handlers - meta: flush_handlers diff --git a/ansible/roles/venus/templates/venus-api.json.j2 b/ansible/roles/venus/templates/venus-api.json.j2 deleted file mode 100644 index 0a825529d8..0000000000 --- a/ansible/roles/venus/templates/venus-api.json.j2 +++ /dev/null @@ -1,25 +0,0 @@ -{ - "command": "venus_api --config-file /etc/venus/venus.conf", - "config_files": [ - { - "source": "{{ container_config_directory }}/venus.conf", - "dest": "/etc/venus/venus.conf", - "owner": "venus", - "perm": "0644" - }{% if kolla_copy_ca_into_containers | bool %}, - { - "source": "{{ container_config_directory }}/ca-certificates", - "dest": "/var/lib/kolla/share/ca-certificates", - "owner": "root", - "perm": "0600" - }{% endif %} - ], - "permissions": [ - { - "path":"/var/log/kolla/venus/venus-api.log", - "owner": "venus:venus", - "recurse": true - } - ] -} - diff --git a/ansible/roles/venus/templates/venus-manager.json.j2 b/ansible/roles/venus/templates/venus-manager.json.j2 deleted file mode 100644 index 02f7503cb3..0000000000 --- a/ansible/roles/venus/templates/venus-manager.json.j2 +++ /dev/null @@ -1,25 +0,0 @@ -{ - "command": "venus_manager --config-file /etc/venus/venus.conf task start", - "config_files": [ - { - "source": "{{ container_config_directory }}/venus.conf", - "dest": "/etc/venus/venus.conf", - "owner": "venus", - "perm": "0644" - }{% if kolla_copy_ca_into_containers | bool %}, - { - "source": "{{ container_config_directory }}/ca-certificates", - "dest": "/var/lib/kolla/share/ca-certificates", - "owner": "root", - "perm": "0600" - }{% endif %} - ], - "permissions": [ - { - "path":"/var/log/kolla/venus/venus-manager.log", - "owner": "venus:venus", - "recurse": true - } - ] -} - diff --git a/ansible/roles/venus/templates/venus.conf.j2 b/ansible/roles/venus/templates/venus.conf.j2 deleted file mode 100644 index d4cbd91f40..0000000000 --- a/ansible/roles/venus/templates/venus.conf.j2 +++ /dev/null @@ -1,38 +0,0 @@ -[DEFAULT] -my_ip = {{ api_interface_address }} -periodic_interval = 60 -rootwrap_config = /etc/venus/rootwrap.conf -api_paste_config = /etc/venus/api-paste.ini -log_dir = /var/log/kolla/venus/ -debug = {{ venus_logging_debug }} -auth_strategy = keystone -os_region_name = {{ openstack_region_name }} -osapi_venus_listen = {{ api_interface_address }} -osapi_venus_listen_port = {{ venus_api_port }} - -logging_default_format_string = {{ openstack_logging_default_format_string }} -logging_context_format_string = {{ openstack_logging_context_format_string }} - -transport_url = {{ rpc_transport_url }} - -[database] -connection = mysql+pymysql://{{ venus_database_user }}:{{ venus_database_password }}@{{ venus_database_address }}/{{ venus_database_name }}?charset=utf8{{ '&ssl_ca=' ~ openstack_cacert if venus_database_enable_tls_internal | bool }} - -[keystone_authtoken] -cafile = {{ openstack_cacert }} -project_name = service -password = {{ venus_keystone_password }} -username = {{ venus_keystone_user }} -auth_url = {{ keystone_internal_url }} -project_domain_id = {{ default_project_domain_id }} -user_domain_id = {{ default_user_domain_id }} -auth_type = password -memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} - -{% if enable_opensearch | bool %} -[elasticsearch] -url = {{ opensearch_internal_endpoint }} -{% endif %} - -[oslo_concurrency] -lock_path = /var/lib/venus/tmp diff --git a/ansible/roles/venus/vars/main.yml b/ansible/roles/venus/vars/main.yml deleted file mode 100644 index 3955d5f95f..0000000000 --- a/ansible/roles/venus/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -project_name: "venus" diff --git a/ansible/site.yml b/ansible/site.yml index 0ab3862741..33855f1d61 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -68,7 +68,6 @@ - enable_tacker_{{ enable_tacker | bool }} - enable_telegraf_{{ enable_telegraf | bool }} - enable_trove_{{ enable_trove | bool }} - - enable_venus_{{ enable_venus | bool }} - enable_watcher_{{ enable_watcher | bool }} - enable_zun_{{ enable_zun | bool }} tags: always @@ -326,11 +325,6 @@ tasks_from: loadbalancer tags: trove when: enable_trove | bool - - include_role: - name: venus - tasks_from: loadbalancer - tags: venus - when: enable_venus | bool - include_role: name: watcher tasks_from: loadbalancer @@ -1066,21 +1060,6 @@ - { role: masakari, tags: masakari } -- name: Apply role venus - gather_facts: false - hosts: - - venus-api - - venus-manager - - '&enable_venus_True' - serial: '{{ kolla_serial|default("0") }}' - max_fail_percentage: >- - {{ venus_max_fail_percentage | - default(kolla_max_fail_percentage) | - default(100) }} - roles: - - { role: venus, - tags: venus } - - name: Apply role skyline gather_facts: false hosts: diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 38aab5c60a..37a7486d32 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -376,7 +376,6 @@ workaround_ansible_issue_8743: yes #enable_horizon_octavia: "{{ enable_octavia | bool }}" #enable_horizon_tacker: "{{ enable_tacker | bool }}" #enable_horizon_trove: "{{ enable_trove | bool }}" -#enable_horizon_venus: "{{ enable_venus | bool }}" #enable_horizon_watcher: "{{ enable_watcher | bool }}" #enable_horizon_zun: "{{ enable_zun | bool }}" #enable_influxdb: "{{ enable_cloudkitty | bool and cloudkitty_storage_backend == 'influxdb' }}" @@ -432,7 +431,6 @@ workaround_ansible_issue_8743: yes #enable_telegraf: "no" #enable_trove: "no" #enable_trove_singletenant: "no" -#enable_venus: "no" #enable_watcher: "no" #enable_zun: "no" diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index 8647dd9d29..5705873d68 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -131,9 +131,6 @@ tacker_keystone_password: zun_database_password: zun_keystone_password: -venus_database_password: -venus_keystone_password: - masakari_database_password: masakari_keystone_password: diff --git a/releasenotes/notes/drop-venus-b929071fb79b8026.yaml b/releasenotes/notes/drop-venus-b929071fb79b8026.yaml new file mode 100644 index 0000000000..e33fe99bb0 --- /dev/null +++ b/releasenotes/notes/drop-venus-b929071fb79b8026.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for deploying ``Venus`` container images has been dropped. diff --git a/tests/check-logs.sh b/tests/check-logs.sh index a9f7d464e3..dac11ccb9b 100755 --- a/tests/check-logs.sh +++ b/tests/check-logs.sh @@ -97,9 +97,6 @@ function check_fluentd_missing_logs { /var/log/kolla/tenks/*) continue ;; - /var/log/kolla/venus/*) - continue - ;; /var/log/kolla/zun/*) continue ;; diff --git a/tests/run.yml b/tests/run.yml index 7e9d71a775..d421c3e7a0 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -10,7 +10,7 @@ - name: Set facts for commonly used variables vars: # NOTE(yoctozepto): needed here to use in other facts too - openstack_core_enabled: "{{ scenario not in ['bifrost', 'mariadb', 'prometheus-opensearch', 'venus'] }}" + openstack_core_enabled: "{{ scenario not in ['bifrost', 'mariadb', 'prometheus-opensearch'] }}" set_fact: kolla_inventory_path: "/etc/kolla/inventory" logs_dir: "/tmp/logs" @@ -526,13 +526,6 @@ when: - scenario == "prometheus-opensearch" - - name: Run test-venus.sh script - script: - cmd: test-venus.sh - executable: /bin/bash - chdir: "{{ kolla_ansible_src_dir }}" - when: scenario == "venus" - - name: Run test-skyline.sh script script: cmd: test-skyline.sh diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 32a28773fb..1ec2a74422 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -236,12 +236,6 @@ octavia_network_type: "tenant" enable_redis: "yes" {% endif %} -{% if scenario == "venus" %} -enable_opensearch: "yes" -enable_keystone: "yes" -enable_venus: "yes" -{% endif %} - {% if groups['all'] | length == 1 %} keepalived_track_script_enabled: "no" {% endif %} diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2 index ca98719a89..d0711e93ee 100644 --- a/tests/templates/inventory.j2 +++ b/tests/templates/inventory.j2 @@ -231,9 +231,6 @@ control [blazar:children] control -[venus:children] -monitoring - [letsencrypt:children] loadbalancer @@ -662,12 +659,6 @@ ovn-database [ovn-sb-db-relay:children] ovn-database -[venus-api:children] -venus - -[venus-manager:children] -venus - [letsencrypt-webserver:children] letsencrypt diff --git a/tests/test-venus.sh b/tests/test-venus.sh deleted file mode 100755 index 0039d67749..0000000000 --- a/tests/test-venus.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -set -o xtrace -set -o errexit -set -o pipefail - -# Enable unbuffered output -export PYTHONUNBUFFERED=1 - -# TODO(yoctozepto): Avoid duplicating this from prometheus-opensearch -function check_opensearch { - # Verify that we see a healthy index created due to Fluentd forwarding logs - local opensearch_url=${OS_AUTH_URL%:*}:9200/_cluster/health - output_path=$1 - args=( - --include - --location - --fail - ) - if ! curl "${args[@]}" $opensearch_url > $output_path; then - return 1 - fi - # NOTE(mgoddard): Status may be yellow because no indices have been - # created. - if ! grep -E '"status":"(green|yellow)"' $output_path >/dev/null; then - return 1 - fi -} - -function check_venus { - local venus_url=${OS_AUTH_URL%:*}:10010/custom_config - output_path=$1 - if ! curl --include --fail $venus_url > $output_path; then - return 1 - fi - if ! grep -E '"status": "SUPPORTED"' $output_path >/dev/null; then - return 1 - fi -} - -function test_opensearch { - echo "TESTING: OpenSearch" - output_path=$(mktemp) - attempt=1 - while ! check_opensearch $output_path; do - echo "OpenSearch not accessible yet" - attempt=$((attempt+1)) - if [[ $attempt -eq 12 ]]; then - echo "FAILED: OpenSearch did not become accessible. Response:" - cat $output_path - return 1 - fi - sleep 10 - done - echo "SUCCESS: OpenSearch" -} - -function test_venus { - echo "TESTING: Venus" - output_path=$(mktemp) - attempt=1 - while ! check_venus $output_path; do - echo "Venus not accessible yet" - attempt=$((attempt+1)) - if [[ $attempt -eq 12 ]]; then - echo "FAILED: Venus did not become accessible. Response:" - cat $output_path - return 1 - fi - sleep 10 - done - echo "SUCCESS: Venus" -} - -function test_venus_scenario_logged { - . /etc/kolla/admin-openrc.sh - - test_opensearch - test_venus -} - -function test_venus_scenario { - echo "Testing Venus and OpenSearch" - test_venus_scenario_logged > /tmp/logs/ansible/test-venus-scenario 2>&1 - result=$? - if [[ $result != 0 ]]; then - echo "Testing Venus scenario failed. See ansible/test-venus-scenario for details" - else - echo "Successfully tested Venus scenario. See ansible/test-venus-scenario for details" - fi - return $result -} - -test_venus_scenario diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 2c078fc032..dffc20c4ed 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -29,7 +29,6 @@ # NOTE(mnasiadka): SSO and non-SSO tests are failing #- kolla-ansible-scenario-skyline - kolla-ansible-scenario-telemetry - - kolla-ansible-scenario-venus - openstack-cover-jobs - openstack-python3-jobs-kolla-ansible - periodic-stable-jobs diff --git a/zuul.d/scenarios/venus.yaml b/zuul.d/scenarios/venus.yaml deleted file mode 100644 index f933304c7a..0000000000 --- a/zuul.d/scenarios/venus.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -- job: - name: kolla-ansible-venus-base - parent: kolla-ansible-base - voting: false - files: !inherit - - ^ansible/group_vars/all/(fluentd|opensearch|venus).yml - - ^ansible/roles/(fluentd|opensearch|venus)/ - - ^tests/test-venus.sh - vars: - scenario: venus - scenario_images_core: - - ^cron - - ^opensearch - - ^fluentd - - ^haproxy - - ^keepalived - - ^keystone - - ^kolla-toolbox - - ^mariadb - - ^memcached - - ^rabbitmq - - ^venus - tls_enabled: false - -- job: - name: kolla-ansible-debian-bookworm-venus - parent: kolla-ansible-venus-base - nodeset: kolla-ansible-debian-bookworm-8GB - -- job: - name: kolla-ansible-ubuntu-noble-venus - parent: kolla-ansible-venus-base - nodeset: kolla-ansible-ubuntu-noble-8GB - -- project-template: - name: kolla-ansible-scenario-venus - description: | - Runs Kolla-Ansible Venus scenario jobs. - check: - jobs: - - kolla-ansible-debian-bookworm-venus - - kolla-ansible-ubuntu-noble-venus