kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Puppet plugin: support Debian Buster

Browse source 
Note that the puppetlabs upstream repo doesn't actually have
    buster builds yet, so this patch won't work until they do that.
This commit is contained in:
andrewbogott 2019-03-04 01:17:47 -06:00
parent 64aeeadbdb
commit 0d0e3e5513
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bootstrapvz/plugins/puppet/tasks.py
View file

@ -3,10 +3,11 @@ from bootstrapvz.base import Task
from bootstrapvz.common import phases from bootstrapvz.common import phases
from bootstrapvz.common.tasks import apt from bootstrapvz.common.tasks import apt
from bootstrapvz.common.exceptions import TaskError from bootstrapvz.common.exceptions import TaskError
from bootstrapvz.common.releases import jessie, wheezy, stretch from bootstrapvz.common.releases import jessie, wheezy, stretch, buster
from bootstrapvz.common.tools import sed_i, log_check_call, rel_path from bootstrapvz.common.tools import sed_i, log_check_call, rel_path
ASSETS_DIR_BUSTER = rel_path(__file__, 'assets/gpg-keyrings-PC1/buster')
ASSETS_DIR_STRETCH = rel_path(__file__, 'assets/gpg-keyrings-PC1/stretch') ASSETS_DIR_STRETCH = rel_path(__file__, 'assets/gpg-keyrings-PC1/stretch')
ASSETS_DIR_JESSIE = rel_path(__file__, 'assets/gpg-keyrings-PC1/jessie') ASSETS_DIR_JESSIE = rel_path(__file__, 'assets/gpg-keyrings-PC1/jessie')
ASSETS_DIR_WHEEZY = rel_path(__file__, 'assets/gpg-keyrings-PC1/wheezy') ASSETS_DIR_WHEEZY = rel_path(__file__, 'assets/gpg-keyrings-PC1/wheezy')
@ -18,7 +19,7 @@ class CheckRequestedDebianRelease(Task):
@classmethod @classmethod
def run(cls, info): def run(cls, info):
if info.manifest.release not in (jessie, wheezy, stretch): if info.manifest.release not in (jessie, wheezy, stretch, buster):
msg = 'Debian {info.manifest.release} is not (yet) available in the Puppetlabs.com APT repository.' msg = 'Debian {info.manifest.release} is not (yet) available in the Puppetlabs.com APT repository.'
raise TaskError(msg) raise TaskError(msg)
@ -63,6 +64,8 @@ class InstallPuppetlabsPC1ReleaseKey(Task):
@classmethod @classmethod
def run(cls, info): def run(cls, info):
from shutil import copy from shutil import copy
if (info.manifest.release == buster):
key_path = os.path.join(ASSETS_DIR_BUSTER, 'puppetlabs-pc1-keyring.gpg')
if (info.manifest.release == stretch): if (info.manifest.release == stretch):
key_path = os.path.join(ASSETS_DIR_STRETCH, 'puppetlabs-pc1-keyring.gpg') key_path = os.path.join(ASSETS_DIR_STRETCH, 'puppetlabs-pc1-keyring.gpg')
if (info.manifest.release == jessie): if (info.manifest.release == jessie):
@ -79,6 +82,8 @@ class AddPuppetlabsPC1SourcesList(Task):
@classmethod @classmethod
def run(cls, info): def run(cls, info):
if (info.manifest.release == buster):
info.source_lists.add('puppetlabs', 'deb http://apt.puppetlabs.com buster PC1')
if (info.manifest.release == stretch): if (info.manifest.release == stretch):
info.source_lists.add('puppetlabs', 'deb http://apt.puppetlabs.com stretch PC1') info.source_lists.add('puppetlabs', 'deb http://apt.puppetlabs.com stretch PC1')
if (info.manifest.release == jessie): if (info.manifest.release == jessie):