Skip to content

Commit 9a348c5

Browse files
committed
Disable custom apt config for non-overcloud hosts
non-overcloud hosts e.g. the seed hypervisor are configured before the seed and its services are deployed. This means that they will look for the local package repo mirrors before they exist.
1 parent 038c811 commit 9a348c5

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

etc/kayobe/apt.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,18 @@ stackhpc_apt_repositories:
6262
signed_by: docker.asc
6363
architecture: amd64
6464

65-
apt_repositories: "{{ stackhpc_apt_repositories }}"
65+
# Do not replace apt configuration for non-overcloud hosts. This can result in
66+
# errors if apt reconfiguration is performed before local repository mirrors
67+
# are deployed.
68+
apt_repositories: "{{ stackhpc_apt_repositories if 'overcloud' in group_names else [] }}"
6669

6770
# Whether to disable repositories in /etc/apt/sources.list. This may be used
6871
# when replacing the distribution repositories via apt_repositories.
6972
# Default is false.
70-
apt_disable_sources_list: true
73+
# Do not disable the default apt configuration for non-overcloud hosts. This
74+
# can result in errors if apt reconfiguration is performed before local
75+
# repository mirrors are deployed.
76+
apt_disable_sources_list: "{{ 'overcloud' in group_names }}"
7177

7278
###############################################################################
7379
# Dummy variable to allow Ansible to accept this file.

etc/kayobe/kolla/globals.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# To work around issue of trying to install docker from
55
# empty pulp server, use upstream docker dnf repo on
66
# non-overcloud hosts
7-
enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names or ansible_facts.os_family == 'Debian' }}{% endraw %}"
7+
enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names }}{% endraw %}"
88

99
# kolla_base_distro must be set here to be resolvable on a per-host basis
1010
# This is necessary for os migrations where mixed clouds might be deployed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Disabled custom APT configuration for non-overcloud hosts (Ubuntu Only).
5+
This resolves the issue of the seed hypervisor attempting to pull packages
6+
from the repository on the seed before it has been deployed.

0 commit comments

Comments
 (0)