fixes #20089 - remove deleted puppet modules

Katello · Jul 12, 2017 · 4ba8296 · 4ba8296
1 parent 3438db6
commit 4ba8296
Show file tree

Hide file tree

Showing 12 changed files with 5,018 additions and 10,480 deletions.
diff --git a/app/lib/actions/pulp/repository/create.rb b/app/lib/actions/pulp/repository/create.rb
@@ -92,6 +92,7 @@ def puppet_importer
           importer.ssl_client_cert = input[:ssl_client_cert]
           importer.ssl_client_key  = input[:ssl_client_key]
           importer.ssl_validation  = input[:ssl_validation]
+          importer.remove_missing  = input[:mirror_on_sync]
           importer.basic_auth_username = input[:upstream_username] if input[:upstream_username].present?
           importer.basic_auth_password = input[:upstream_password] if input[:upstream_password].present?
           importer

diff --git a/app/models/katello/glue/pulp/repo.rb b/app/models/katello/glue/pulp/repo.rb
@@ -157,8 +157,7 @@ def generate_importer(capsule = SmartProxy.default_capsule!)
         when Repository::FILE_TYPE
           Runcible::Models::IsoImporter.new(importer_ssl_options(capsule).merge(:feed => importer_feed_url(capsule)))
         when Repository::PUPPET_TYPE
-          options = {:feed => importer_feed_url(capsule)}
-          Runcible::Models::PuppetImporter.new(importer_ssl_options(capsule).merge(options))
+          Runcible::Models::PuppetImporter.new(puppet_importer_values(capsule))
         when Repository::DOCKER_TYPE
           options = {}
           options[:upstream_name] = capsule.default_capsule? ? self.docker_upstream_name : self.container_repository_name
@@ -207,6 +206,14 @@ def yum_importer_values(capsule)
         config.merge(importer_ssl_options(capsule))
       end
 
+      def puppet_importer_values(capsule)
+        config = {
+          :feed => self.importer_feed_url(capsule),
+          :remove_missing => capsule.default_capsule? ? self.mirror_on_sync? : true
+        }
+        config.merge(importer_ssl_options(capsule))
+      end
+
       def importer_ssl_options(capsule = SmartProxy.default_capsule!)
         if !capsule.default_capsule?
           ueber_cert = ::Cert::Certs.ueber_cert(organization)

diff --git a/...ascripts/bastion_katello/products/details/repositories/details/views/repository-info.html b/...ascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
@@ -71,7 +71,8 @@ <h4 translate>Basic Information</h4>
             options="checksums"
             on-save="save(repository)">
         </dd>
-
+      </span>
+        <span ng-show="repository.content_type === 'yum' || repository.content_type === 'puppet'">
         <dt translate>Mirror on Sync</dt>
         <dd bst-edit-checkbox="repository.mirror_on_sync"
             formatter="booleanToYesNo"

diff --git a/...s/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html b/...s/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
@@ -125,7 +125,7 @@ <h6 translate>
         </p>
       </div>
 
-      <div class="checkbox" ng-show="repository.content_type === 'yum'">
+      <div class="checkbox" ng-show="repository.content_type === 'yum' || repository.content_type === 'puppet'">
         <label>
           <input id="mirror_on_sync" name="mirror_on_sync" ng-model="repository.mirror_on_sync" type="checkbox"/>
           <span translate>Mirror on Sync</span>