Skip to content

Bypass pulp on seed hypervisor and seed vm #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2022
Merged

Bypass pulp on seed hypervisor and seed vm #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion etc/kayobe/dnf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# file: myrepo
# gpgkey: http://gpgkey
# gpgcheck: yes
dnf_custom_repos: "{{ dnf_custom_repos_el8 | combine(lookup('vars', 'dnf_custom_repos_' ~ ansible_facts.distribution | lower )) }}"
stackhpc_dnf_repos: "{{ dnf_custom_repos_el8 | combine(lookup('vars', 'dnf_custom_repos_' ~ ansible_facts.distribution | lower )) }}"

# Custom repositories shared between all RHEL derivatives.
dnf_custom_repos_el8:
Expand All @@ -59,6 +59,13 @@ dnf_custom_repos_el8:
file: epel-modular
gpgkey: "{{ dnf_epel_gpg_key_url }}"
gpgcheck: yes
docker:
baseurl: "{{ stackhpc_repo_docker_url }}"
description: "Package repository for installing docker"
enabled: "{{ dnf_enable_docker | bool }}"
file: docker
gpgkey: "{{ dnf_docker_gpg_key_url }}"
gpgcheck: yes

# CentOS Stream 8 specific repositories
dnf_custom_repos_centos:
Expand Down Expand Up @@ -112,6 +119,13 @@ dnf_epel_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"
# systems only. Default value is 'true'.
dnf_install_epel: false

# Whether to enable docker dnf repo in stackhpc_dnf_repos
dnf_enable_docker: true

#URL of docker repo GPG key
dnf_docker_gpg_key_url: "https://download.docker.com/linux/centos/gpg"


###############################################################################
# DNF Automatic configuration.

Expand Down
5 changes: 5 additions & 0 deletions etc/kayobe/inventory/group_vars/overcloud/stackhpc-dnf-repos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Only use local pulp mirrors for overcloud hosts
# to avoid situations where the seed-hypervisor
# tries to use a local pulp repo on the seed VM
# before the seed vm has been provisioned
dnf_custom_repos: "{{ stackhpc_dnf_repos }}"
8 changes: 6 additions & 2 deletions etc/kayobe/kolla/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# yamllint disable-file
---
docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}"
docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg"

# To work around issue of trying to install docker from
# empty pulp server, use upstream docker dnf repo on
# non-overcloud hosts
enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names }}"{% endraw %}


{% if kolla_base_distro == 'centos' %}
bifrost_tag: xena-20221128T101757
Expand Down