From 8f8753d90eefc770739887f9966d376eae8b7e92 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 17 Aug 2016 09:58:41 -0400 Subject: [PATCH] include ::diskimage_builder in builder.pp too Since it is possible for ::nodepool::builder to only be called, we need to make sure diskimage-builder is also installed. Change-Id: Ibbb49bbb6a28ee402dfb60ca5ca1fa2ae8f2f7da Signed-off-by: Paul Belanger --- manifests/builder.pp | 2 ++ manifests/init.pp | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/builder.pp b/manifests/builder.pp index 36c1a44..20cdb29 100644 --- a/manifests/builder.pp +++ b/manifests/builder.pp @@ -23,6 +23,8 @@ class nodepool::builder( $upload_workers = '4', ) { + include ::diskimage_builder + file { '/etc/init.d/nodepool-builder': ensure => present, mode => '0555', diff --git a/manifests/init.pp b/manifests/init.pp index b40dfb5..57ff1a7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -107,8 +107,6 @@ class nodepool ( source => $git_source_repo, } - include ::diskimage_builder - include ::pip exec { 'install_nodepool' : command => 'pip install -U /opt/nodepool',