aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-06-11 20:09:46 -0300
committerSilvio Rhatto <rhatto@riseup.net>2018-06-11 20:09:46 -0300
commit28d23155b3a8b11a389847245cda9b26396dec1b (patch)
tree65ae094513584d7cb1d0d355296f55132a65e63a /manifests
parente6e1f17dd2e7ed21ad8c52cd6f59438c10055ffc (diff)
downloadpuppet-virtual-28d23155b3a8b11a389847245cda9b26396dec1b.tar.gz
puppet-virtual-28d23155b3a8b11a389847245cda9b26396dec1b.tar.bz2
KVM: support for image preseeding
Diffstat (limited to 'manifests')
-rw-r--r--manifests/kvm/images.pp16
-rw-r--r--manifests/kvm/kvmx.pp2
2 files changed, 14 insertions, 4 deletions
diff --git a/manifests/kvm/images.pp b/manifests/kvm/images.pp
index 64876e9..1c4e7f4 100644
--- a/manifests/kvm/images.pp
+++ b/manifests/kvm/images.pp
@@ -4,7 +4,8 @@ class virtual::kvm::images {
home => "/usr/local/share/iso",
}
- file { [ '/usr/local/share/iso', "/usr/local/share/iso/${lsbdistcodename}", "/usr/local/share/iso/${lsbdistcodename}/installer" ]:
+ file { [ '/usr/local/share/iso', "/usr/local/share/iso/${lsbdistcodename}",
+ "/usr/local/share/iso/${lsbdistcodename}/installer", "/usr/local/share/iso/${lsbdistcodename}/installer/profiles" ]:
ensure => directory,
owner => iso,
group => iso,
@@ -12,13 +13,22 @@ class virtual::kvm::images {
require => User['iso'],
}
+ file { "/usr/local/share/iso/${lsbdistcodename}/installer/profiles/kvm.preseed":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => '0644',
+ source => 'puppet:///modules/virtual/kvm/kvm.preseed',
+ require => File["/usr/local/share/iso/${lsbdistcodename}/installer/profiles"],
+ }
+
exec { "build-simple-cdd-${lsbdistcodename}":
- command => '/usr/bin/build-simple-cdd --serial-console',
+ command => '/usr/bin/build-simple-cdd --serial-console --profiles kvm',
user => 'iso',
timeout => 0,
cwd => "/usr/local/share/iso/${lsbdistcodename}/installer",
creates => "/usr/local/share/iso/${lsbdistcodename}/installer/images/debian-${lsbdistrelease}-${architecture}-CD-1.iso",
- require => [ File["/usr/local/share/iso/${lsbdistcodename}/installer"], Package['simple-cdd'] ],
+ require => [ File["/usr/local/share/iso/${lsbdistcodename}/installer/profiles/kvm.preseed"], Package['simple-cdd'] ],
}
exec { "debirf-make-profile-rescue-${lsbdistcodename}":
diff --git a/manifests/kvm/kvmx.pp b/manifests/kvm/kvmx.pp
index 49761c2..4711f25 100644
--- a/manifests/kvm/kvmx.pp
+++ b/manifests/kvm/kvmx.pp
@@ -7,7 +7,7 @@ class virtual::kvm::kvmx {
ensure => present,
provider => git,
source => 'https://git.fluxo.info/kvmx',
- revision => '697017619877106c21884aac72fb392e392db96b',
+ revision => 'cbe2e6f3c4dd81879aaec84546e0b9f86d67c1d0',
owner => 'root',
group => 'root',
}