foreman_git_templates 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f37d8fd9a09c475e1e544c46d1d17d52b928d1dbdb8f37a77c83e4e45aafb026
-  data.tar.gz: 4dca8880532ee1fcd6d5b28d45896bd922505841e68af7945e2115f3b51de16a
+  metadata.gz: 9c38324b0492c54b19ee28e823d91e8f18b6d1427f477710e6516544115b7b1a
+  data.tar.gz: 1317ddbf95b8fb0b3601494828e3a6658bdad95a1b656b567edf7617a17378f7
 SHA512:
-  metadata.gz: 403f6ec203c8d2f1a9267249f9107d3323ec24c0e68a23420ec8f89b3a6d75fb091d25931fc2de6785b3b635c91ac97a6d48435a4678ff799f0968dee598e51f
-  data.tar.gz: e13f00738e2878f7f7f102e9b5d4df745e3b54caa3aba7afe1c82b9ebd297415b4c5f9b634ddb0cb6b9764737acf60d76951d58f77aec261fa1eb76e86466397
+  metadata.gz: a47d11977a3bbf7a2b86d409ae75a42045c932a96191aa0c4384890171d071588aa26682ef5e75ba889bd64f119ec9ab039d9940a06c524adb9b8d0735d86566
+  data.tar.gz: '054158b459f6a48992f170a3f6f39e54d500a18aef4d4eab1b2c151901cc3ca1e449b2c1cc13cc1ac2d87b09ac464ae08d81817a550cbd0d471931594f69933a'

data/README.md

@@ -44,6 +44,14 @@ From now the template content for this host will be fetched from the repository.
 - `There was an error rendering the provision template: Cannot read <template> from repository`
   - check if there is requested template in the repository
 
+### Gitlab Repository Integration
+
+If you want to use a private repository hosted on a Gitlab instance to store your Foreman templates, you can use [Gitlab's repositories API](https://docs.gitlab.com/ee/api/repositories.html#get-file-archive) to construct the `template_url` parameter in Foreman. Create a dedicated Foreman user in Gitlab and set up a Personal Access Token that you can use in the `template_url`.
+
+```
+https://gitlab.example.com/api/v4/projects/${GITLAB_PROJECT_ID}/repository/archive.tar.gz?sha=${GITLAB_BRANCH_NAME}&private_token=${PERSONAL_ACCESS_TOKEN}
+```
+
 ## Contributing
 
 Fork and send a Pull Request. Thanks!

data/app/models/concerns/foreman_git_templates/hostext/operating_system.rb

@@ -9,7 +9,7 @@ module ForemanGitTemplates
         def provisioning_template(opts = {})
           return super unless repository_path
 
-          kind = opts[:kind] || 'provision'
+          kind = opts[:kind].to_s || 'provision'
           available_template_kinds.find { |template| template.name == kind }
         end
 

data/lib/foreman_git_templates/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanGitTemplates
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/test/models/concerns/foreman_git_templates/hostext/operating_system_test.rb

@@ -6,6 +6,28 @@ module Hostext
   class OperatingSystemTest < ActiveSupport::TestCase
     let(:host) { FactoryBot.create(:host, :managed, :with_template_url) }
 
+    describe '#provisioning_template' do
+      it 'finds all PXELinux template kinds' do
+        Dir.mktmpdir do |dir|
+          stub_repository host.params['template_url'], "#{dir}/repo.tar.gz" do |tar|
+            tar.add_file_simple('templates/PXELinux/template.erb', 644, host.name.length) { |io| io.write(host.name) }
+          end
+
+          assert_equal 'PXELinux', host.provisioning_template(kind: 'PXELinux')&.name
+        end
+      end
+
+      it 'finds all PXELinux template kinds by symbol' do
+        Dir.mktmpdir do |dir|
+          stub_repository host.params['template_url'], "#{dir}/repo.tar.gz" do |tar|
+            tar.add_file_simple('templates/PXELinux/template.erb', 644, host.name.length) { |io| io.write(host.name) }
+          end
+
+          assert_equal 'PXELinux', host.provisioning_template(kind: :PXELinux)&.name
+        end
+      end
+    end
+
     test 'available_template_kinds finds only templates that are defined in the repository' do
       Dir.mktmpdir do |dir|
         expected_kinds = ['PXEGrub', 'PXELinux', 'iPXE', 'PXEGrub2', 'provision']

data/test/models/concerns/foreman_git_templates/orchestration/tftp_test.rb

@@ -62,8 +62,47 @@ class TFTPOrchestrationTest < ActiveSupport::TestCase
     end
   end
 
+  describe '#validate_tftp' do
+    let(:host) { FactoryBot.create(:host, :with_tftp_orchestration, :with_template_url, pxe_loader: 'PXELinux BIOS') }
+    let(:kind) { 'PXELinux' }
+    let(:template_content) { 'main template content' }
+    let(:default_local_boot_template_content) { 'default local boot template content' }
+
+    context 'host is in build mode' do
+      setup do
+        host.update(build: true)
+      end
+
+      it 'validates that the host is ready for tftp' do
+        Dir.mktmpdir do |dir|
+          stub_repository host.params['template_url'], "#{dir}/repo.tar.gz" do |tar|
+            tar.add_file_simple("templates/#{kind}/template.erb", 644, template_content.length) { |io| io.write(template_content) }
+            tar.add_file_simple("templates/#{kind}/default_local_boot.erb", 644, default_local_boot_template_content.length) { |io| io.write(default_local_boot_template_content) }
+          end
+
+          host.provision_interface.send(:validate_tftp)
+          assert_empty host.errors.messages
+        end
+      end
+    end
+
+    context 'host is not build mode' do
+      it 'validates that the host is ready for tftp' do
+        Dir.mktmpdir do |dir|
+          stub_repository host.params['template_url'], "#{dir}/repo.tar.gz" do |tar|
+            tar.add_file_simple("templates/#{kind}/template.erb", 644, template_content.length) { |io| io.write(template_content) }
+            tar.add_file_simple("templates/#{kind}/default_local_boot.erb", 644, default_local_boot_template_content.length) { |io| io.write(default_local_boot_template_content) }
+          end
+
+          host.provision_interface.send(:validate_tftp)
+          assert_empty host.errors.messages
+        end
+      end
+    end
+  end
+
   describe '#setTFTP' do
-    let(:host) { FactoryBot.create(:host, :with_tftp_orchestration, :with_template_url) }
+    let(:host) { FactoryBot.create(:host, :with_tftp_orchestration, :with_template_url, pxe_loader: 'PXELinux BIOS') }
 
     let(:kind) { 'PXELinux' }
     let(:template_content) { 'main template content' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_git_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - dmTECH GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down