Project

General

Profile

Revision c0df0f4c

Added by Evgeni Golov over 4 years ago

Refs #25576 - allow passing "subdir" to PuppetInstallDistributor

The relevant pulp-puppet feature was added in 2.13 [1].
It allows pulp-puppet to better clean up the distributor.

[1] https://pulp.plan.io/issues/2108

View differences:

lib/runcible/models/puppet_install_distributor.rb
4 4 
module Runcible
5 5 
  module Models
6 6 
    class PuppetInstallDistributor < Distributor
7 
      attr_accessor 'install_path'
7 
      attr_accessor 'install_path', 'subdir'
8 8 

  		




  9
  9
  
    
      def initialize(install_path, params = {})


  		




  10
  10
  
    
        @install_path = install_path


  		












  

    
      test/models/puppet_install_distributor_test.rb
    
  





  5
  5
  
    

  		




  6
  6
  
    
class PuppetInstallDistributorTest < MiniTest::Unit::TestCase


  		




  7
  7
  
    
  def setup


  		




  8
  
  
    
    @dist = Runcible::Models::PuppetInstallDistributor.new('/etc/puppet')


  		




  
  8
  
    
    @dist = Runcible::Models::PuppetInstallDistributor.new('/etc/puppet', :subdir => 'modules')


  		




  9
  9
  
    
  end


  		




  10
  10
  
    

  		




  11
  11
  
    
  def test_config


  		




  12
  
  
    
    config = {'install_path' => '/etc/puppet', 'auto_publish' => false}


  		




  
  12
  
    
    config = {'install_path' => '/etc/puppet', 'subdir' => 'modules', 'auto_publish' => false}


  		




  13
  13
  
    
    assert_equal config, @dist.config


  		




  14
  14
  
    
  end


  		




  15
  15
  
    

  		




  
  16
  
    
  def test_config_nosubdir


  		




  
  17
  
    
    nosubdir_dist = Runcible::Models::PuppetInstallDistributor.new('/etc/puppet')


  		




  
  18
  
    
    config = {'install_path' => '/etc/puppet', 'auto_publish' => false}


  		




  
  19
  
    
    assert_equal config, nosubdir_dist.config


  		




  
  20
  
    
  end


  		




  
  21
  
    

  		




  16
  22
  
    
  def test_type_id


  		




  17
  23
  
    
    assert_equal('puppet_install_distributor', @dist.type_id)


  		




  18
  24
  
    
  end


  		












Also available in:  Unified diff