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 <mnasiadka@gmail.com>

README.rst

@@ -64,7 +64,6 @@ Kolla Ansible deploys containers for the following OpenStack projects:
 - Skyline (`APIServer <https://docs.openstack.org/skyline-apiserver/latest/>`__ and `Console <https://docs.openstack.org/skyline-console/latest/>`__)
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
 - `Trove <https://docs.openstack.org/trove/latest/>`__
-- `Venus <https://docs.openstack.org/venus/latest/>`__
 - `Watcher <https://docs.openstack.org/watcher/latest/>`__
 - `Zun <https://docs.openstack.org/zun/latest/>`__
 

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 }}"
 

ansible/group_vars/all/venus.yml

@@ -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 }}"

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
 

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
 

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:

ansible/roles/cron/templates/cron-logrotate-venus.conf.j2

@@ -1,3 +0,0 @@
-"/var/log/kolla/venus/*.log"
-{
-}

ansible/roles/fluentd/templates/conf/filter/01-rewrite.conf.j2

@@ -136,11 +136,6 @@
     pattern ^(masakari-engine|masakari-api)$
     tag openstack_python
   </rule>
-  <rule>
-    key     programname
-    pattern ^(venus-api|venus-manager)$
-    tag openstack_python
-  </rule>
   <rule>
     key     programname
     pattern ^(skyline)$

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' }}"

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 }}"

ansible/roles/venus/defaults/main.yml

@@ -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 }}"

ansible/roles/venus/handlers/main.yml

@@ -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) }}"

ansible/roles/venus/tasks/bootstrap.yml

@@ -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

ansible/roles/venus/tasks/check-containers.yml

@@ -1,3 +0,0 @@
----
-- import_role:
-    name: service-check-containers

ansible/roles/venus/tasks/check.yml

@@ -1,4 +0,0 @@
----
-- name: Checking Venus containers
-  import_role:
-    role: service-check

ansible/roles/venus/tasks/clone.yml

@@ -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 }}"

ansible/roles/venus/tasks/config.yml

@@ -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 }}"

ansible/roles/venus/tasks/config_validate.yml

@@ -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 }}"

ansible/roles/venus/tasks/copy-certs.yml

@@ -1,6 +0,0 @@
----
-- name: "Copy certificates and keys for {{ project_name }}"
-  import_role:
-    role: service-cert-copy
-  vars:
-    project_services: "{{ venus_services }}"

ansible/roles/venus/tasks/deploy-containers.yml

@@ -1,2 +0,0 @@
----
-- import_tasks: check-containers.yml

ansible/roles/venus/tasks/deploy.yml

@@ -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

ansible/roles/venus/tasks/loadbalancer.yml

@@ -1,7 +0,0 @@
----
-- name: "Configure loadbalancer for {{ project_name }}"
-  import_role:
-    name: loadbalancer-config
-  vars:
-    project_services: "{{ venus_services }}"
-  tags: always

ansible/roles/venus/tasks/main.yml

@@ -1,2 +0,0 @@
----
-- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/venus/tasks/precheck.yml

@@ -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']

ansible/roles/venus/tasks/pull.yml

@@ -1,3 +0,0 @@
----
-- import_role:
-    role: service-images-pull

ansible/roles/venus/tasks/reconfigure.yml

@@ -1,2 +0,0 @@
----
-- import_tasks: deploy.yml

ansible/roles/venus/tasks/register.yml

@@ -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 }}"

ansible/roles/venus/tasks/stop.yml

@@ -1,6 +0,0 @@
----
-- import_role:
-    name: service-stop
-  vars:
-    project_services: "{{ venus_services }}"
-    service_name: "{{ project_name }}"

ansible/roles/venus/tasks/upgrade.yml

@@ -1,7 +0,0 @@
----
-- import_tasks: config.yml
-
-- import_tasks: check-containers.yml
-
-- name: Flush handlers
-  meta: flush_handlers

ansible/roles/venus/templates/venus-api.json.j2

@@ -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
-        }
-    ]
-}
-

ansible/roles/venus/templates/venus-manager.json.j2

@@ -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
-        }
-    ]
-}
-

ansible/roles/venus/templates/venus.conf.j2

@@ -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

ansible/roles/venus/vars/main.yml

@@ -1,2 +0,0 @@
----
-project_name: "venus"

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:

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"
 

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:
 

releasenotes/notes/drop-venus-b929071fb79b8026.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Support for deploying ``Venus`` container images has been dropped.

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
             ;;

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

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 %}

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
 

tests/test-venus.sh

@@ -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

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

zuul.d/scenarios/venus.yaml

@@ -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