Skip to content

Commit 65c7f18

Browse files
committed
Move enable_docker_repo to group_vars
1 parent ccb7e2f commit 65c7f18

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

etc/kayobe/inventory/group_vars/overcloud/stackhpc-dnf-repos renamed to etc/kayobe/inventory/group_vars/overcloud/stackhpc-repos

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
# tries to use a local pulp repo on the seed VM
44
# before the seed vm has been provisioned
55
dnf_custom_repos: "{{ stackhpc_dnf_repos }}"
6+
7+
enable_docker_repo: false

etc/kayobe/kolla/globals.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
# yamllint disable-file
22
---
33

4-
# To work around issue of trying to install docker from
5-
# empty pulp server, use upstream docker dnf repo on
6-
# non-overcloud hosts
7-
enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names or ansible_facts.os_family == 'Debian' }}{% endraw %}"
8-
94
# kolla_base_distro must be set here to be resolvable on a per-host basis
105
# This is necessary for os migrations where mixed clouds might be deployed
116
kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}"

0 commit comments

Comments
 (0)