Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • very-demiurge-very-mindful/kolla-ansible
1 result
Show changes
Showing
with 167 additions and 119 deletions
...@@ -21,6 +21,7 @@ import sys ...@@ -21,6 +21,7 @@ import sys
import yaml import yaml
from importlib.metadata import Distribution from importlib.metadata import Distribution
from time import sleep
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
...@@ -45,15 +46,20 @@ def _detect_install_prefix(path: os.path) -> str: ...@@ -45,15 +46,20 @@ def _detect_install_prefix(path: os.path) -> str:
return prefix_path return prefix_path
def _get_direct_url(dist: Distribution) -> str: def _get_direct_url_if_editable(dist: Distribution) -> str:
direct_url = os.path.join(dist._path, 'direct_url.json') direct_url = os.path.join(dist._path, 'direct_url.json')
editable = None
if os.path.isfile(direct_url): if os.path.isfile(direct_url):
with open(direct_url, 'r') as f: with open(direct_url, 'r') as f:
direct_url_content = json.loads(f.readline().strip()) direct_url_content = json.loads(f.readline().strip())
url = direct_url_content['url'] dir_info = direct_url_content.get('dir_info')
prefix = 'file://' if dir_info is not None:
if url.startswith(prefix): editable = dir_info.get('editable')
return url[len(prefix):] if editable:
url = direct_url_content['url']
prefix = 'file://'
if url.startswith(prefix):
return url[len(prefix):]
return None return None
...@@ -66,7 +72,7 @@ def _get_base_path() -> os.path: ...@@ -66,7 +72,7 @@ def _get_base_path() -> os.path:
kolla_ansible_dist = list(Distribution.discover(name="kolla_ansible")) kolla_ansible_dist = list(Distribution.discover(name="kolla_ansible"))
if kolla_ansible_dist: if kolla_ansible_dist:
direct_url = _get_direct_url(kolla_ansible_dist[0]) direct_url = _get_direct_url_if_editable(kolla_ansible_dist[0])
if direct_url: if direct_url:
return direct_url return direct_url
...@@ -101,12 +107,24 @@ def galaxy_collection_install(requirements_file: str, ...@@ -101,12 +107,24 @@ def galaxy_collection_install(requirements_file: str,
args += ["--requirements-file", requirements_file] args += ["--requirements-file", requirements_file]
if force: if force:
args += ["--force"] args += ["--force"]
try:
run_command("ansible-galaxy", args) for retry_count in range(1, 6):
except subprocess.CalledProcessError as e: try:
LOG.error("Failed to install Ansible collections from %s via Ansible " run_command("ansible-galaxy", args)
"Galaxy: returncode %d", requirements_file, e.returncode) except subprocess.CalledProcessError as e:
sys.exit(e.returncode) if retry_count < 5:
LOG.warning(f"Failed to install Ansible collections from "
f"{requirements_file} using Ansible Galaxy "
f"(error: {e}) (retry: {retry_count}/5)")
sleep(2)
continue
else:
LOG.error(f"Failed to install Ansible collections from "
f"{requirements_file} using Ansible Galaxy "
f"(error: {e}) after 5 retries")
LOG.error("Exiting")
sys.exit(e.returncode)
break
def read_file(path: os.path, mode: str = "r") -> str | bytes: def read_file(path: os.path, mode: str = "r") -> str | bytes:
...@@ -168,6 +186,6 @@ def run_command(executable: str, ...@@ -168,6 +186,6 @@ def run_command(executable: str,
if quiet: if quiet:
kwargs["stdout"] = subprocess.DEVNULL kwargs["stdout"] = subprocess.DEVNULL
kwargs["stderr"] = subprocess.DEVNULL kwargs["stderr"] = subprocess.DEVNULL
subprocess.run(full_cmd, shell=False, **kwargs) # nosec subprocess.run(full_cmd, check=True, shell=False, **kwargs) # nosec
else: else:
subprocess.run(full_cmd, shell=False, **kwargs) # nosec subprocess.run(full_cmd, check=True, shell=False, **kwargs) # nosec
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
features: features:
- | - |
Adds ``prometheus_node_exporter_targets_extra`` to add additional scrape Adds ``prometheus_node_exporter_targets_extra`` to add additional scrape
targets to the node exporter job. See kolla-ansible-doc:`documentation targets to the node exporter job. See `documentation
<reference/logging-and-monitoring/prometheus-guide.html>` for more <https://docs.openstack.org/kolla-ansible/latest/reference/logging-and-monitoring/prometheus-guide.html>`__
information. for more information.
---
fixes:
- |
Fixes cases when fluentd parser fails on Python traceback.
OpenStack services regex has been reworked to include both
global_request_id and handling cases with Python traceback.
`LP#2044370 <https://launchpad.net/bugs/2044370>`_
---
fixes:
- |
Fixes external ceph cinder keyring is not imported into libvirt if
templated.
Per now, ansible/roles/nova-cell/tasks/external_ceph.yml looks
cinder_cephx_raw_key up as file from cinder_cephx_keyring_file.stat.path
To allow templated cinderkeyrings, the lookup is changed to "template"
Fixes `LP#2089229
<https://bugs.launchpad.net/kolla-ansible/+bug/2089229>`__
---
fixes:
- |
Fixes internal endpoint for the ``heat-cfn`` (CloudFormation) service.
`LP#2087537 <https://launchpad.net/bugs/2087537>`__
---
features:
- |
``kolla-ansible install-deps`` subcommand will now retry on Ansible Galaxy
collections installation failures.
---
features:
- |
Generates a system-scoped ``public-openrc-system.sh`` file. This allows
running Ironic commands against the public API, which is useful when access
to the internal API is unavailable.
`LP#2051837 <https://launchpad.net/bugs/2051837>`__
--- ---
upgrade: upgrade:
- | - |
Rewrite kolla-ansible CLI to python Rewrite kolla-ansible CLI in Python. Moving the CLI to Python allows for
easier maintenance and larger feature set. The CLI was built using the
cliff package that is used in the ``openstack`` and ``kayobe`` commands.
Moving the CLI to python allows for easier This patch introduces a few breaking changes stemming from the nature of
maintenance and larger feature set. the cliff package:
The CLI was built using the cliff package
that is used in openstack-cli and kayobe-cli.
This patch introduces a few breaking changes. * the order of parameters must be ``kolla-ansible <action> <arguments>``
The changes stem the nature of the cliff package. * ``mariadb_backup`` and ``mariadb_recovery`` now are ``mariadb-backup``
1. the order of parameters must be and ``mariadb-recovery``
kolla-ansible <action> <arguments>
2. mariadb_backup and mariadb_recovery now are The ``--key`` parameter has also been dropped as it was duplicating
mariadb-backup and mariadb-recovery ``--vault-password-file``.
---
fixes:
- |
Adds a check to stop deploying/upgrading the RabbitMQ containers if it
will result in downgrading the version of RabbitMQ running.
---
fixes:
- |
Fixes a bug where the RabbitMQ version check would fail to pull the new
image due to lack of auth.
`LP#2086171 <https://bugs.launchpad.net/kolla-ansible/+bug/2086171>`__
--- ---
features: features:
- | - |
Implements service-cert-copy role being able to Implements service-cert-copy role being able to copy certs to non-HAProxy
copy certs to non-HAProxy container. container. `Partial Blueprint mariadb-ssl-support
`Partial Blueprint mariadb-ssl-support <https://blueprints.launchpad.net/kolla-ansible/+spec/mariadb-ssl-support>` <https://blueprints.launchpad.net/kolla-ansible/+spec/mariadb-ssl-support>`__
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
collections: collections:
- name: https://opendev.org/openstack/ansible-collection-kolla - name: https://opendev.org/openstack/ansible-collection-kolla
type: git type: git
version: master version: stable/2024.2
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
- name: Create TLS certificates for octavia - name: Create TLS certificates for octavia
shell: | shell: |
source {{ kolla_ansible_venv_path }}/bin/activate source {{ kolla_ansible_venv_path }}/bin/activate
kolla-ansible octavia-certificates kolla-ansible octavia-certificates -i {{ kolla_inventory_path }} -vvvv
when: scenario in ['octavia'] when: scenario in ['octavia']
args: args:
executable: /bin/bash executable: /bin/bash
......
...@@ -80,7 +80,15 @@ function prepare_images { ...@@ -80,7 +80,15 @@ function prepare_images {
sudo tee -a /etc/kolla/kolla-build.conf <<EOF sudo tee -a /etc/kolla/kolla-build.conf <<EOF
[DEFAULT] [DEFAULT]
engine = ${CONTAINER_ENGINE} engine = ${CONTAINER_ENGINE}
EOF
if [[ $BASE_DISTRO == "debian" || $BASE_DISTRO == "ubuntu" ]]; then
sudo tee -a /etc/kolla/kolla-build.conf <<EOF
base_image = quay.io/openstack.kolla/${BASE_DISTRO}
EOF
fi
sudo tee -a /etc/kolla/kolla-build.conf <<EOF
[profiles] [profiles]
gate = ${GATE_IMAGES} gate = ${GATE_IMAGES}
EOF EOF
...@@ -88,7 +96,7 @@ EOF ...@@ -88,7 +96,7 @@ EOF
sudo mkdir -p /tmp/logs/build sudo mkdir -p /tmp/logs/build
sudo mkdir -p /opt/kolla_registry sudo mkdir -p /opt/kolla_registry
sudo $CONTAINER_ENGINE run -d --net=host -e REGISTRY_HTTP_ADDR=0.0.0.0:4000 --restart=always -v /opt/kolla_registry/:/var/lib/registry --name registry registry:2 sudo $CONTAINER_ENGINE run -d --net=host -e REGISTRY_HTTP_ADDR=0.0.0.0:4000 --restart=always -v /opt/kolla_registry/:/var/lib/registry --name registry quay.io/libpod/registry:2.8.2
python3 -m venv ~/kolla-venv python3 -m venv ~/kolla-venv
......
[storage] [storage]
{% for host in hostvars %} {% for host in hostvars | reject('equalto', 'localhost') %}
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }}
{% endfor %} {% endfor %}
......
...@@ -92,6 +92,7 @@ etcd_remove_deleted_members: "yes" ...@@ -92,6 +92,7 @@ etcd_remove_deleted_members: "yes"
docker_configure_for_zun: "yes" docker_configure_for_zun: "yes"
containerd_configure_for_zun: "yes" containerd_configure_for_zun: "yes"
enable_cinder: "yes" enable_cinder: "yes"
cinder_cluster_skip_precheck: "yes"
# lvm backup driver for cinder-backup does not exist # lvm backup driver for cinder-backup does not exist
enable_cinder_backup: "no" enable_cinder_backup: "no"
enable_cinder_backend_lvm: "yes" enable_cinder_backend_lvm: "yes"
...@@ -114,6 +115,8 @@ enable_aodh: "yes" ...@@ -114,6 +115,8 @@ enable_aodh: "yes"
{% if scenario == "ironic" %} {% if scenario == "ironic" %}
enable_ironic: "yes" enable_ironic: "yes"
enable_prometheus: "yes"
enable_prometheus_openstack_exporter: "no"
ironic_dnsmasq_dhcp_ranges: ironic_dnsmasq_dhcp_ranges:
- range: "10.42.0.2,10.42.0.254,255.255.255.0" - range: "10.42.0.2,10.42.0.254,255.255.255.0"
{% endif %} {% endif %}
...@@ -149,7 +152,7 @@ enable_redis: "yes" ...@@ -149,7 +152,7 @@ enable_redis: "yes"
enable_ceph_rgw: "yes" enable_ceph_rgw: "yes"
ceph_rgw_hosts: ceph_rgw_hosts:
{% for host in hostvars %} {% for host in hostvars | reject('equalto', 'localhost') %}
- host: {{ host }} - host: {{ host }}
ip: {{ hostvars[host]['ansible_host'] }} ip: {{ hostvars[host]['ansible_host'] }}
port: 6780 port: 6780
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }}
{% endfor %} {% endfor %}
{% else %} {% else %}
{% for host in hostvars %} {% for host in hostvars | reject('equalto', 'localhost') %}
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
...@@ -31,28 +31,28 @@ control ...@@ -31,28 +31,28 @@ control
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }}
{% endfor %} {% endfor %}
{% else %} {% else %}
{% for host in hostvars %} {% for host in hostvars | reject('equalto', 'localhost') %}
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
[storage] [storage]
{% for host in hostvars %} {% for host in hostvars | reject('equalto', 'localhost') %}
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }}
{% endfor %} {% endfor %}
[monitoring] [monitoring]
{% for host in hostvars %} {% for host in hostvars | reject('equalto', 'localhost') %}
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }}
{% endfor %} {% endfor %}
[deployment] [deployment]
{% for host in hostvars %} {% for host in hostvars | reject('equalto', 'localhost') %}
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }}
{% endfor %} {% endfor %}
{% if scenario == 'cells' %} {% if scenario == 'cells' %}
{% for host in hostvars %} {% for host in hostvars | reject('equalto', 'localhost') %}
{% set cell_name = 'cell' ~ loop.index %} {% set cell_name = 'cell' ~ loop.index %}
[{{ cell_name }}] [{{ cell_name }}]
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} mariadb_shard_id={{ loop.index0 % 2 }} {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} mariadb_shard_id={{ loop.index0 % 2 }}
...@@ -123,7 +123,7 @@ storage ...@@ -123,7 +123,7 @@ storage
# In CI we want Pacemaker to run on primary and secondary (to test with HA). # In CI we want Pacemaker to run on primary and secondary (to test with HA).
[hacluster] [hacluster]
{% for host in hostvars %} {% for host in hostvars | reject('equalto', 'localhost') %}
{% if host in ['primary', 'secondary'] %} {% if host in ['primary', 'secondary'] %}
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} {{ host }} ansible_host={{ hostvars[host]['ansible_host'] }}
{% endif %} {% endif %}
......
...@@ -11,7 +11,7 @@ export PYTHONUNBUFFERED=1 ...@@ -11,7 +11,7 @@ export PYTHONUNBUFFERED=1
function check_certificate_expiry { function check_certificate_expiry {
RAW_INVENTORY=/etc/kolla/inventory RAW_INVENTORY=/etc/kolla/inventory
source $KOLLA_ANSIBLE_VENV_PATH/bin/activate source $KOLLA_ANSIBLE_VENV_PATH/bin/activate
kolla-ansible octavia-certificates --check-expiry 7 kolla-ansible octavia-certificates -i ${RAW_INVENTORY} --check-expiry 7
deactivate deactivate
} }
......
...@@ -9,7 +9,7 @@ usedevelop = True ...@@ -9,7 +9,7 @@ usedevelop = True
allowlist_externals = bash allowlist_externals = bash
find find
rm rm
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
podman>=4.3.0,<5 podman>=4.3.0,<5
...@@ -42,7 +42,7 @@ commands = ...@@ -42,7 +42,7 @@ commands =
[testenv:venv] [testenv:venv]
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
...@@ -50,7 +50,7 @@ commands = {posargs} ...@@ -50,7 +50,7 @@ commands = {posargs}
[testenv:docs] [testenv:docs]
skip_install = true skip_install = true
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
rm -rf doc/build/html rm -rf doc/build/html
...@@ -97,7 +97,7 @@ setenv = ...@@ -97,7 +97,7 @@ setenv =
ANSIBLE_ROLES_PATH = {toxinidir}/ansible/roles ANSIBLE_ROLES_PATH = {toxinidir}/ansible/roles
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/lint-requirements.txt -r{toxinidir}/lint-requirements.txt
allowlist_externals = bash allowlist_externals = bash
...@@ -154,7 +154,7 @@ setenv = {[testenv:linters]setenv} ...@@ -154,7 +154,7 @@ setenv = {[testenv:linters]setenv}
deps = {[testenv:linters]deps} deps = {[testenv:linters]deps}
commands = commands =
python {toxinidir}/tools/validate-all-file.py python {toxinidir}/tools/validate-all-file.py
ansible-lint -p --exclude {toxinidir}/tests --exclude {toxinidir}/roles --exclude {toxinidir}/etc ansible-lint -p --exclude tests --exclude roles --exclude etc --exclude zuul.d
[testenv:yamllint] [testenv:yamllint]
deps = {[testenv:linters]deps} deps = {[testenv:linters]deps}
......
...@@ -74,13 +74,19 @@ ...@@ -74,13 +74,19 @@
- zuul: openstack/kolla - zuul: openstack/kolla
- job: - job:
name: kolla-ansible-kvm-base
parent: kolla-ansible-base parent: kolla-ansible-base
voting: false name: kolla-ansible-scenario-base
files: files:
- ^requirements-core.yml - ^requirements-core.yml
- ^ansible/roles/(nova-cell)/
- ^tests/templates/(inventory|globals-default.j2) - ^tests/templates/(inventory|globals-default.j2)
- ^tests/(pre|run).yml
- job:
name: kolla-ansible-kvm-base
parent: kolla-ansible-scenario-base
voting: false
files: !inherit
- ^ansible/roles/(nova-cell)/
- ^tests/templates/nova-compute-overrides.j2 - ^tests/templates/nova-compute-overrides.j2
vars: vars:
virt_type: kvm virt_type: kvm
...@@ -102,25 +108,21 @@ ...@@ -102,25 +108,21 @@
- job: - job:
name: kolla-ansible-bifrost-base name: kolla-ansible-bifrost-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/bifrost/ - ^ansible/roles/bifrost/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-bifrost.sh - ^tests/test-bifrost.sh
vars: vars:
scenario: bifrost scenario: bifrost
- job: - job:
name: kolla-ansible-ironic-base name: kolla-ansible-ironic-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(ironic|neutron|nova|nova-cell)/ - ^ansible/roles/(ironic|neutron|nova|nova-cell)/
- ^tests/deploy-tenks\.sh$ - ^tests/deploy-tenks\.sh$
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/templates/ironic-overrides\.j2$ - ^tests/templates/ironic-overrides\.j2$
- ^tests/templates/tenks-deploy-config\.yml\.j2$ - ^tests/templates/tenks-deploy-config\.yml\.j2$
- ^tests/test-dashboard\.sh$ - ^tests/test-dashboard\.sh$
...@@ -132,13 +134,11 @@ ...@@ -132,13 +134,11 @@
- job: - job:
name: kolla-ansible-zun-base name: kolla-ansible-zun-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(zun|kuryr|etcd|cinder|iscsi)/ - ^ansible/roles/(zun|kuryr|etcd|cinder|iscsi)/
- ^tests/setup_disks.sh - ^tests/setup_disks.sh
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-core-openstack.sh - ^tests/test-core-openstack.sh
- ^tests/test-zun.sh - ^tests/test-zun.sh
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
...@@ -147,14 +147,12 @@ ...@@ -147,14 +147,12 @@
- job: - job:
name: kolla-ansible-swift-base name: kolla-ansible-swift-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(glance|swift)/ - ^ansible/roles/(glance|swift)/
- ^tests/setup_disks.sh - ^tests/setup_disks.sh
- ^tests/init-swift.sh - ^tests/init-swift.sh
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-core-openstack.sh - ^tests/test-core-openstack.sh
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
- ^tests/test-swift.sh - ^tests/test-swift.sh
...@@ -170,12 +168,10 @@ ...@@ -170,12 +168,10 @@
- job: - job:
name: kolla-ansible-magnum-base name: kolla-ansible-magnum-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(designate|magnum|trove)/ - ^ansible/roles/(designate|magnum|trove)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
- ^tests/test-magnum.sh - ^tests/test-magnum.sh
vars: vars:
...@@ -183,12 +179,10 @@ ...@@ -183,12 +179,10 @@
- job: - job:
name: kolla-ansible-octavia-base name: kolla-ansible-octavia-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(octavia|octavia-certificates)/ - ^ansible/roles/(octavia|octavia-certificates)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
- ^tests/test-octavia.sh - ^tests/test-octavia.sh
vars: vars:
...@@ -196,13 +190,11 @@ ...@@ -196,13 +190,11 @@
- job: - job:
name: kolla-ansible-masakari-base name: kolla-ansible-masakari-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/masakari/ - ^ansible/roles/masakari/
- ^ansible/roles/hacluster/ - ^ansible/roles/hacluster/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-masakari.sh - ^tests/test-masakari.sh
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
vars: vars:
...@@ -210,24 +202,20 @@ ...@@ -210,24 +202,20 @@
- job: - job:
name: kolla-ansible-mariadb-base name: kolla-ansible-mariadb-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: true voting: true
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/mariadb/ - ^ansible/roles/mariadb/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-mariadb.sh - ^tests/test-mariadb.sh
vars: vars:
scenario: mariadb scenario: mariadb
- job: - job:
name: kolla-ansible-scenario-nfv-base name: kolla-ansible-scenario-nfv-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(aodh|barbican|heat|mistral|redis|tacker)/ - ^ansible/roles/(aodh|barbican|heat|mistral|redis|tacker)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-scenario-nfv.sh - ^tests/test-scenario-nfv.sh
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
vars: vars:
...@@ -235,12 +223,10 @@ ...@@ -235,12 +223,10 @@
- job: - job:
name: kolla-ansible-cells-base name: kolla-ansible-cells-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/nova/ - ^ansible/roles/nova/
- ^tests/templates/(inventory|globals-default.j2)
- ^ansible/roles/loadbalancer/ - ^ansible/roles/loadbalancer/
- ^tests/test-core-openstack.sh - ^tests/test-core-openstack.sh
- ^tests/test-proxysql.sh - ^tests/test-proxysql.sh
...@@ -249,12 +235,10 @@ ...@@ -249,12 +235,10 @@
- job: - job:
name: kolla-ansible-ovn-base name: kolla-ansible-ovn-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(neutron|octavia|openvswitch|ovn-controller|ovn-db)/ - ^ansible/roles/(neutron|octavia|openvswitch|ovn-controller|ovn-db)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-ovn.sh - ^tests/test-ovn.sh
- ^tests/test-core-openstack.sh - ^tests/test-core-openstack.sh
- ^tests/reconfigure.sh - ^tests/reconfigure.sh
...@@ -263,24 +247,20 @@ ...@@ -263,24 +247,20 @@
- job: - job:
name: kolla-ansible-prometheus-opensearch-base name: kolla-ansible-prometheus-opensearch-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(common|opensearch|grafana|prometheus)/ - ^ansible/roles/(common|opensearch|grafana|prometheus)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-prometheus-opensearch.sh - ^tests/test-prometheus-opensearch.sh
vars: vars:
scenario: prometheus-opensearch scenario: prometheus-opensearch
- job: - job:
name: kolla-ansible-venus-base name: kolla-ansible-venus-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/(common|opensearch|venus)/ - ^ansible/roles/(common|opensearch|venus)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-venus.sh - ^tests/test-venus.sh
vars: vars:
scenario: venus scenario: venus
...@@ -295,19 +275,19 @@ ...@@ -295,19 +275,19 @@
voting: false voting: false
files: files:
- ^requirements-core.yml - ^requirements-core.yml
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/(pre|run).yml
- ^kolla_ansible/ - ^kolla_ansible/
- ^tests/run-hashi-vault.yml - ^tests/run-hashi-vault.yml
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-hashicorp-vault-passwords.sh - ^tests/test-hashicorp-vault-passwords.sh
- job: - job:
name: kolla-ansible-haproxy-base name: kolla-ansible-haproxy-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^ansible/roles/haproxy/ - ^ansible/roles/haproxy/
- ^kolla_ansible/kolla_url.py - ^kolla_ansible/kolla_url.py
- ^tests/templates/(inventory|globals-default.j2)
vars: vars:
external_api_interface_name: vxlan2 external_api_interface_name: vxlan2
external_api_network_prefix: "192.0.3." external_api_network_prefix: "192.0.3."
...@@ -317,13 +297,11 @@ ...@@ -317,13 +297,11 @@
- job: - job:
name: kolla-ansible-lets-encrypt-base name: kolla-ansible-lets-encrypt-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/common/templates/conf/input/11-letsencrypt.conf.j2 - ^ansible/roles/common/templates/conf/input/11-letsencrypt.conf.j2
- ^ansible/roles/(letsencrypt|loadbalancer)/ - ^ansible/roles/(letsencrypt|loadbalancer)/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-core-openstack.sh - ^tests/test-core-openstack.sh
- ^tests/test-dashboard.sh - ^tests/test-dashboard.sh
- ^tests/deploy.sh - ^tests/deploy.sh
...@@ -334,24 +312,20 @@ ...@@ -334,24 +312,20 @@
- job: - job:
name: kolla-ansible-skyline-base name: kolla-ansible-skyline-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files: !inherit
- ^requirements-core.yml
- ^ansible/roles/skyline/ - ^ansible/roles/skyline/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-skyline.sh - ^tests/test-skyline.sh
vars: vars:
scenario: skyline scenario: skyline
- job: - job:
name: kolla-ansible-skyline-sso-base name: kolla-ansible-skyline-sso-base
parent: kolla-ansible-base parent: kolla-ansible-scenario-base
voting: false voting: false
files: files:
- ^requirements-core.yml
- ^ansible/roles/skyline/ - ^ansible/roles/skyline/
- ^tests/templates/(inventory|globals-default.j2)
- ^tests/test-skyline-sso.sh - ^tests/test-skyline-sso.sh
vars: vars:
scenario: skyline-sso scenario: skyline-sso