.fixtures.yml

@@ -6,7 +6,9 @@ fixtures:
     dhcp:     'https://github.com/theforeman/puppet-dhcp'
     dns:      'https://github.com/theforeman/puppet-dns'
     extlib:   'https://github.com/voxpupuli/puppet-extlib'
-    foreman:  'https://github.com/theforeman/puppet-foreman'
+    foreman:
+      repo:   'https://github.com/theforeman/puppet-foreman'
+      branch: '9.2-stable'
     mysql:    'https://github.com/puppetlabs/puppetlabs-mysql'
     puppet:   'https://github.com/theforeman/puppet-puppet'
     stdlib:   'https://github.com/puppetlabs/puppetlabs-stdlib'

.travis.yml

@@ -20,13 +20,13 @@ matrix:
     # Acceptance tests
     - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker\,hostname=centos7-64.example.com}
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker\,hostname=centos7-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
     - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker\,hostname=debian9-64.example.com}
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker\,hostname=debian9-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [8.0.1](https://github.com/theforeman/puppet-foreman_proxy/tree/8.0.1) (2018-08-29)
+
+[Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/8.0.0...8.0.1)
+
+**Fixed bugs:**
+
+- Move the REX SSH directory to /var/lib/foreman-proxy [\#451](https://github.com/theforeman/puppet-foreman_proxy/pull/451) ([ekohl](https://github.com/ekohl))
+- fixes [\#24690](https://projects.theforeman.org/issues/24690) - add symlink grub2/boot to ../boot [\#449](https://github.com/theforeman/puppet-foreman_proxy/pull/449) ([stbenjam](https://github.com/stbenjam))
+
 ## [8.0.0](https://github.com/theforeman/puppet-foreman_proxy/tree/8.0.0) (2018-07-16)
 
 [Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/7.2.3...8.0.0)

Gemfile

@@ -28,8 +28,10 @@ gem 'puppet-lint-version_comparison-check'
 gem 'simplecov'
 gem 'github_changelog_generator', {"git"=>"https://github.com/skywinder/github-changelog-generator", "ref"=>"20ee04ba1234e9e83eb2ffb5056e23d641c7a018", "groups"=>["development"]}
 gem 'puppet-blacksmith', '>= 4.1.0', {"groups"=>["development"]}
-gem 'beaker', '>= 3.9.0', {"groups"=>["system_tests"]}
+gem 'beaker', '>= 4.0.0', {"groups"=>["system_tests"]}
+gem 'beaker-docker', {"groups"=>["system_tests"]}
 gem 'beaker-hostgenerator', '>= 1.1.10', {"groups"=>["system_tests"]}
+gem 'beaker-puppet', {"groups"=>["system_tests"]}
 gem 'beaker-rspec', {"groups"=>["system_tests"]}
 gem 'beaker-module_install_helper', {"groups"=>["system_tests"]}
 gem 'beaker-puppet_install_helper', {"groups"=>["system_tests"]}

Rakefile

@@ -32,7 +32,7 @@ begin
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
     metadata = JSON.load(File.read('metadata.json'))
-    config.user = metadata['author']
+    config.user = 'theforeman'
     config.project = "puppet-#{metadata['name'].split('-').last}"
     config.future_release = metadata['version']
     config.exclude_labels = ['duplicate', 'question', 'invalid', 'wontfix', 'Modulesync', 'skip-changelog']

manifests/plugin/remote_execution/ssh/params.pp

@@ -1,14 +1,12 @@
 # Remote Execution SSH default parameters
 class foreman_proxy::plugin::remote_execution::ssh::params {
-  include ::foreman_proxy::params
-
   $enabled            = true
   $listen_on          = 'https'
   $local_working_dir  = '/var/tmp'
   $remote_working_dir = '/var/tmp'
   $generate_keys      = true
   $install_key        = false
-  $ssh_identity_dir   = "${::foreman_proxy::params::dir}/.ssh"
+  $ssh_identity_dir   = '/var/lib/foreman-proxy/ssh'
   $ssh_identity_file  = 'id_rsa_foreman_proxy'
   $ssh_keygen         = '/usr/bin/ssh-keygen'
   $ssh_kerberos_auth  = false

manifests/tftp/netboot.pp

@@ -7,6 +7,12 @@
 ) inherits foreman_proxy::tftp::netboot::params {
   ensure_packages($packages, { ensure => 'present', })
 
+  # The symlink from grub2/boot to boot is needed for UEFI HTTP boot
+  file {"${root}/grub2/boot":
+    ensure => 'link',
+    target => '../boot',
+  }
+
   case $grub_installation_type {
     'redhat_exec': {
       $efi_lib_dir = '/usr/lib/grub/x86_64-efi'

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-foreman_proxy",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "author": "theforeman",
   "summary": "Foreman Smart Proxy configuration",
   "license": "GPL-3.0+",

spec/classes/foreman_proxy__plugin__remote_execution__ssh_spec.rb

@@ -17,7 +17,7 @@
     it 'should configure remote_execution_ssh.yml' do
       should contain_file('/etc/foreman-proxy/settings.d/remote_execution_ssh.yml').
         with_content(/^:enabled: https/).
-        with_content(%r{:ssh_identity_key_file: /usr/share/foreman-proxy/.ssh/id_rsa_foreman_proxy}).
+        with_content(%r{:ssh_identity_key_file: /var/lib/foreman-proxy/ssh/id_rsa_foreman_proxy}).
         with_content(%r{:kerberos_auth: false}).
         with({
           :ensure  => 'file',
@@ -29,7 +29,7 @@
     it 'should configure ssh key' do
       should contain_exec('generate_ssh_key').
         with({
-          :command => "/usr/bin/ssh-keygen -f /usr/share/foreman-proxy/.ssh/id_rsa_foreman_proxy -N ''"
+          :command => "/usr/bin/ssh-keygen -f /var/lib/foreman-proxy/ssh/id_rsa_foreman_proxy -N ''"
         })
     end
 

spec/classes/foreman_proxy__tftp__netboot_spec.rb

@@ -12,6 +12,11 @@
       end
 
       it { is_expected.to compile.with_all_deps }
+
+      it 'should create grub2 boot symlink' do
+        should contain_file("/tftproot/grub2/boot").
+          with_ensure('link').with_target("../boot")
+      end
     end
   end
 end

spec/spec_helper.rb

@@ -7,7 +7,6 @@
 include RspecPuppetFacts
 
                                                                              # Original fact sources:
-add_custom_fact :concat_basedir, '/tmp'                                      # puppetlabs-concat
 add_custom_fact :puppet_environmentpath, '/etc/puppetlabs/code/environments' # puppetlabs-stdlib
 add_custom_fact :root_home, '/root'                                          # puppetlabs-stdlib
 

spec/spec_helper_acceptance.rb

@@ -1,5 +1,5 @@
-require 'beaker-rspec/spec_helper'
-require 'beaker-rspec/helpers/serverspec'
+require 'beaker-puppet'
+require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'