openstack/kayobe
Code Issues Proposed changes

Ubuntu: CI: rely on os_distribution, remove interfaces pause

Browse Source 
We can now rely on the os_distribution variable to set sensible defaults
for Ubuntu. It is set automatically in kayobe-config-dev.

The interfaces pause workaround is no longer required since switching to
systemd-networkd.

Depends-On: https://review.opendev.org/c/openstack/kayobe-config-dev/+/788475
Change-Id: I76d658b93b9195c760c3a91fe5aee96bad8d6b42
This commit is contained in:
Mark Goddard 2021-04-28 12:51:09 +01:00
parent d6aa4ea16e
commit 111375fb1a
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/kayobe-overcloud-base/overrides.yml.j2
View File

@ -3,17 +3,10 @@
# Ansible is run directly on the controller. # Ansible is run directly on the controller.
disable_selinux_do_reboot: false disable_selinux_do_reboot: false
{% if ansible_os_family == 'Debian' %}
# On Ubuntu, use 5 seconds delay to allow for interfaces to come up after ifup
# exits.
interfaces_pause_time: 5
{% endif %}
# Use the OpenStack infra's Dockerhub mirror. # Use the OpenStack infra's Dockerhub mirror.
docker_registry_mirrors: docker_registry_mirrors:
- "http://{{ zuul_site_mirror_fqdn }}:8082/" - "http://{{ zuul_site_mirror_fqdn }}:8082/"
kolla_base_distro: "{{ ansible_distribution | lower }}"
kolla_install_type: "{{ 'source' if ansible_distribution == 'Ubuntu' else 'binary' }}" kolla_install_type: "{{ 'source' if ansible_distribution == 'Ubuntu' else 'binary' }}"
kolla_docker_namespace: "openstack.kolla" kolla_docker_namespace: "openstack.kolla"
# use the published images from a site mirror of quay.io # use the published images from a site mirror of quay.io

3
playbooks/kayobe-seed-base/overrides.yml.j2
View File

@ -14,9 +14,6 @@ kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/opensta
kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}" kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}" kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"
kolla_ansible_source_version: "{{ zuul.projects['opendev.org/openstack/kolla-ansible'].checkout }}" kolla_ansible_source_version: "{{ zuul.projects['opendev.org/openstack/kolla-ansible'].checkout }}"
{% if ansible_os_family == 'Debian' %}
kolla_base_distro: ubuntu
{% endif %}
kolla_openstack_logging_debug: True kolla_openstack_logging_debug: True
pip_upper_constraints_file: "/tmp/upper-constraints.txt" pip_upper_constraints_file: "/tmp/upper-constraints.txt"

6
playbooks/kayobe-seed-vm-base/overrides.yml.j2
View File

@ -3,12 +3,6 @@
# Ansible is run directly on the controller. # Ansible is run directly on the controller.
disable_selinux_do_reboot: false disable_selinux_do_reboot: false
{% if ansible_os_family == 'Debian' %}
# On Ubuntu, use 5 seconds delay to allow for interfaces to come up after ifup
# exits.
interfaces_pause_time: 5
{% endif %}
# Use the OpenStack infra's Dockerhub mirror. # Use the OpenStack infra's Dockerhub mirror.
docker_registry_mirrors: docker_registry_mirrors:
- "http://{{ zuul_site_mirror_fqdn }}:8082/" - "http://{{ zuul_site_mirror_fqdn }}:8082/"