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 <pabelanger@redhat.com>
This commit is contained in:
		@@ -23,6 +23,8 @@ class nodepool::builder(
 | 
				
			|||||||
  $upload_workers = '4',
 | 
					  $upload_workers = '4',
 | 
				
			||||||
) {
 | 
					) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  include ::diskimage_builder
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  file { '/etc/init.d/nodepool-builder':
 | 
					  file { '/etc/init.d/nodepool-builder':
 | 
				
			||||||
    ensure => present,
 | 
					    ensure => present,
 | 
				
			||||||
    mode   => '0555',
 | 
					    mode   => '0555',
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -107,8 +107,6 @@ class nodepool (
 | 
				
			|||||||
    source   => $git_source_repo,
 | 
					    source   => $git_source_repo,
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  include ::diskimage_builder
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  include ::pip
 | 
					  include ::pip
 | 
				
			||||||
  exec { 'install_nodepool' :
 | 
					  exec { 'install_nodepool' :
 | 
				
			||||||
    command     => 'pip install -U /opt/nodepool',
 | 
					    command     => 'pip install -U /opt/nodepool',
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user