diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-25 17:18:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-25 17:18:27 +0000 |
| commit | 481572cb6b943446600ca6556dca15fb7256ea65 (patch) | |
| tree | 239b1322ffe77d050ddd772c352e54df3412f84e /kolla/template/methods.py | |
| parent | 6ebec98004a881f084b62ed9a0470bd0b35a2b9a (diff) | |
| parent | ffaf102fecc20510513de4898ce85b5b119e1795 (diff) | |
| download | kolla-481572cb6b943446600ca6556dca15fb7256ea65.tar.gz kolla-481572cb6b943446600ca6556dca15fb7256ea65.zip | |
Merge "Debian/Ubuntu: handle APT keys in proper way"
Diffstat (limited to 'kolla/template/methods.py')
| -rw-r--r-- | kolla/template/methods.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/kolla/template/methods.py b/kolla/template/methods.py index 19fcf4e22..168f30451 100644 --- a/kolla/template/methods.py +++ b/kolla/template/methods.py @@ -115,8 +115,16 @@ def handle_repos(context, reponames, mode): commands += ' %s %s' % (rpm_switch, repo_list[repo]) elif base_package_type == 'deb': if mode == 'enable': - commands += 'echo "%s" ' % repo_list[repo] - commands += '>/etc/apt/sources.list.d/%s.list && ' % repo + commands += f"""echo 'Uris: {repo_list[repo]['url']}' \ +>/etc/apt/sources.list.d/{repo}.sources \ +&& echo 'Components: {repo_list[repo]['component']}' \ +>>/etc/apt/sources.list.d/{repo}.sources \ +&& echo 'Types: deb' >>/etc/apt/sources.list.d/{repo}.sources \ +&& echo 'Suites: {repo_list[repo]['suite']}' \ +>>/etc/apt/sources.list.d/{repo}.sources \ +&& echo 'Signed-By: /etc/kolla/apt-keys/{repo_list[repo]['gpg_key']}' \ +>>/etc/apt/sources.list.d/{repo}.sources \ +&& """ except KeyError: # NOTE(hrw): we ignore missing repositories for a given # distro/arch |