From: Martin Zobel-Helas Date: Tue, 5 Mar 2013 13:41:12 +0000 (+0100) Subject: Require ganeti-instance-debootstrap X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=a7c62e30b552b148e001c663a005cdb7ba69ce19 Require ganeti-instance-debootstrap Signed-off-by: Martin Zobel-Helas --- diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp index 743a29d5..3c79be08 100644 --- a/modules/ganeti2/manifests/init.pp +++ b/modules/ganeti2/manifests/init.pp @@ -26,37 +26,47 @@ class ganeti2 { file { '/etc/ganeti/instance-debootstrap/variants.list': content => template('ganeti2/instance-debootstrap/variants.list.erb'), + require => Package['ganeti-instance-debootstrap'], ; '/etc/ganeti/instance-debootstrap/variants/dsa.conf': content => template('ganeti2/instance-debootstrap/variants/dsa.conf.erb'), + require => Package['ganeti-instance-debootstrap'], ; '/etc/ganeti/instance-debootstrap/variants/dsa-wheezy.conf': content => template('ganeti2/instance-debootstrap/variants/dsa-wheezy.conf.erb'), + require => Package['ganeti-instance-debootstrap'], ; '/etc/ganeti/instance-debootstrap/hooks/00-dsa-configure-networking': content => template('ganeti2/instance-debootstrap/hooks/00-dsa-configure-networking.erb'), + require => Package['ganeti-instance-debootstrap'], mode => '0555', ; '/etc/ganeti/instance-debootstrap/hooks/10-dsa-install-extra-packages': content => template('ganeti2/instance-debootstrap/hooks/10-dsa-install-extra-packages.erb'), + require => Package['ganeti-instance-debootstrap'], mode => '0555', ; '/etc/ganeti/instance-debootstrap/hooks/20-dsa-install-bootloader': content => template('ganeti2/instance-debootstrap/hooks/20-dsa-install-bootloader.erb'), + require => Package['ganeti-instance-debootstrap'], mode => '0555', ; '/etc/ganeti/instance-debootstrap/hooks/30-dsa-install-ssh-keys': content => template('ganeti2/instance-debootstrap/hooks/30-dsa-install-ssh-keys.erb'), + require => Package['ganeti-instance-debootstrap'], mode => '0555', ; '/etc/ganeti/instance-debootstrap/hooks/40-dsa-setup-swapfile': content => template('ganeti2/instance-debootstrap/hooks/40-dsa-setup-swapfile.erb'), + require => Package['ganeti-instance-debootstrap'], mode => '0555', ; '/etc/ganeti/instance-debootstrap/hooks/clear-root-password': + require => Package['ganeti-instance-debootstrap'], mode => '0444', ; '/etc/ganeti/instance-debootstrap/hooks/xen-hvc0': + require => Package['ganeti-instance-debootstrap'], mode => '0444', ; }