Merge "Drop translations scenario"

This commit is contained in:
Zuul
2026-02-25 15:32:14 +00:00
committed by Gerrit Code Review
5 changed files with 2 additions and 39 deletions

View File

@@ -160,9 +160,6 @@
- src: user_variables_ceph.yml.j2
dest: user_variables_ceph.yml
condition: "{{ 'ceph' in bootstrap_host_scenarios_expanded }}"
- src: user_variables_translations.yml.j2
dest: user_variables_translations.yml
condition: "{{ 'translations' in bootstrap_host_scenarios_expanded }}"
- src: user_variables_barbican.yml.j2
dest: user_variables_barbican.yml
condition: "{{ 'barbican' in bootstrap_host_scenarios_expanded }}"

View File

@@ -1,23 +0,0 @@
---
# Copyright 2017, Logan Vig <logan2211@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.
# Trove settings for translations site.
trove_provider_net_name: dbaas-mgmt
trove_service_net_phys_net: dbaas-mgmt
trove_service_net_setup: True
trove_service_net_subnet_cidr: "{{ dbaas_network }}"
trove_service_net_allocation_pool_start: "{{ dbaas_network | ansible.utils.nthhost('110') }}"
trove_service_net_allocation_pool_end: "{{ dbaas_network | ansible.utils.nthhost('-10') }}"

View File

@@ -36,8 +36,8 @@ _lxc_container_backing_store: |-
bootstrap_host_scenarios_expanded: |-
{# Keystone is included in every scenario #}
{% set scenario_list = bootstrap_host_scenarios + ['keystone', 'haproxy'] %}
{% if ['aio', 'translations'] | intersect(bootstrap_host_scenarios) | length > 0 %}
{# Base services deployed with aio and translations scenarios #}
{% if ['aio'] | intersect(bootstrap_host_scenarios) | length > 0 %}
{# Base services deployed with aio scenario #}
{% set _ = scenario_list.extend(['cinder', 'glance', 'neutron', 'nova', 'placement', 'horizon']) %}
{% endif %}
{# Service additions based on scenario presence #}
@@ -63,9 +63,6 @@ bootstrap_host_scenarios_expanded: |-
{% if ['telemetry', 'aodh', 'ceilometer', 'gnocchi'] | intersect(bootstrap_host_scenarios) | length > 0 %}
{% set _ = scenario_list.extend(['aodh', 'ceilometer', 'gnocchi', 'zookeeper']) %}
{% endif %}
{% if 'translations' in bootstrap_host_scenarios %}
{% set _ = scenario_list.extend(['designate', 'heat', 'magnum', 'swift', 'trove']) %}
{% endif %}
{{ (scenario_list | unique) | sort }}
_neutron_plugin_driver: |-

View File

@@ -493,11 +493,6 @@
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-noble
- job:
name: openstack-ansible-deploy-translations-ubuntu-noble
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-noble
- job:
name: openstack-ansible-deploy-aio_distro_metal-ubuntu-noble
parent: openstack-ansible-deploy-aio-distro

View File

@@ -30,9 +30,6 @@
- openstack-ansible-deploy-infra_lxc-validate
- openstack-ansible-deploy-hosts_lxc-validate
- openstack-tox-docs
periodic:
jobs:
- openstack-ansible-deploy-translations-ubuntu-noble
experimental:
jobs:
- openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-noble