CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [13.1.0](https://github.com/theforeman/puppet-foreman/tree/13.1.0) (2019-11-25)
+
+[Full Changelog](https://github.com/theforeman/puppet-foreman/compare/13.0.1...13.1.0)
+
+**Implemented enhancements:**
+
+- Add Foreman AzureRM cli option [\#772](https://github.com/theforeman/puppet-foreman/pull/772) ([apuntamb](https://github.com/apuntamb))
+- Initial AzureRM support [\#767](https://github.com/theforeman/puppet-foreman/pull/767) ([apuntamb](https://github.com/apuntamb))
+
+**Fixed bugs:**
+
+- Fixes [\#28200](https://projects.theforeman.org/issues/28200) - Change cockpit port from 9999 to 19090 [\#768](https://github.com/theforeman/puppet-foreman/pull/768) ([adamruzicka](https://github.com/adamruzicka))
+
 ## [13.0.1](https://github.com/theforeman/puppet-foreman/tree/13.0.1) (2019-10-31)
 
 [Full Changelog](https://github.com/theforeman/puppet-foreman/compare/13.0.0...13.0.1)
@@ -8,7 +21,7 @@
 
 - Fixes [\#28146](https://projects.theforeman.org/issues/28146) - Drop double leading slash from cockpit url [\#764](https://github.com/theforeman/puppet-foreman/pull/764) ([adamruzicka](https://github.com/adamruzicka))
 
-## [13.0.0](https://github.com/theforeman/puppet-foreman/tree/13.0.0) (2019-10-25)
+## [13.0.0](https://github.com/theforeman/puppet-foreman/tree/13.0.0) (2019-10-24)
 
 [Full Changelog](https://github.com/theforeman/puppet-foreman/compare/12.2.0...13.0.0)
 
@@ -671,4 +684,4 @@
 * Update tests for rspec-puppet 1.0.0
 
 
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

Gemfile

@@ -7,7 +7,6 @@ gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 5
 
 gem 'rake'
 gem 'rspec', '~> 3.0'
-gem 'rdoc', '~> 5.1.0', {"platforms"=>["ruby_21"]}
 gem 'rspec-puppet', '~> 2.3'
 gem 'rspec-puppet-facts', '>= 1.7'
 gem 'puppetlabs_spec_helper', '>= 2.1.1'
@@ -25,7 +24,7 @@ gem 'puppet-lint-unquoted_string-check'
 gem 'puppet-lint-variable_contains_upcase'
 gem 'puppet-lint-version_comparison-check'
 gem 'simplecov'
-gem 'github_changelog_generator', {"git"=>"https://github.com/skywinder/github-changelog-generator", "ref"=>"20ee04ba1234e9e83eb2ffb5056e23d641c7a018", "groups"=>["development"]} if RUBY_VERSION >= '2.2.2'
+gem 'github_changelog_generator', '>= 1.15.0'
 gem 'puppet-blacksmith', '>= 4.1.0', {"groups"=>["development"]}
 gem 'beaker', '>= 4.2.0', {"groups"=>["system_tests"]}
 gem 'beaker-docker', {"groups"=>["system_tests"]}

README.md

@@ -52,7 +52,7 @@ previous stable release.
 ### Foreman version compatibility notes
 
 This module targets Foreman 1.21+. Running without passenger is only supported
-on Foreman 1.23+.
+on Foreman 1.23+. The Azure plugin support only works with Foreman 1.24+.
 
 The Foreman userdata plugin has been merged into Foreman 1.23 and removed from
 this module.

manifests/cli/azure.pp

@@ -0,0 +1,6 @@
+# @summary This installs the AzureRM plugin for Hammer CLI
+#
+class foreman::cli::azure {
+  foreman::cli::plugin { 'foreman_azure_rm':
+  }
+}

manifests/plugin/azure.pp

@@ -1,5 +1,5 @@
-# Installs foreman_azure plugin
+# Installs foreman_azure_rm plugin
 class foreman::plugin::azure {
-  foreman::plugin {'azure':
+  foreman::plugin {'azure_rm':
   }
 }

manifests/plugin/remote_execution/cockpit.pp

@@ -6,7 +6,7 @@
   $foreman_url = $foreman::foreman_url
   $cockpit_path = '/webcon'
   $cockpit_host = '127.0.0.1'
-  $cockpit_port = 9999
+  $cockpit_port = 19090
   $cockpit_config = {
     'foreman_url' => $foreman_url,
     'ssl_ca_file' => $foreman::server_ssl_chain,

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-foreman",
-  "version": "13.0.1",
+  "version": "13.1.0",
   "author": "theforeman",
   "summary": "Foreman server configuration",
   "license": "GPL-3.0+",

spec/acceptance/foreman_cli_plugins_spec.rb

@@ -29,6 +29,7 @@ class { '::foreman::cli':
 
     if $facts['osfamily'] == 'RedHat' {
       include ::foreman::cli::ansible
+      include ::foreman::cli::azure
     }
     include ::foreman::cli::discovery
     include ::foreman::cli::remote_execution

spec/acceptance/foreman_prometheus_spec.rb

@@ -86,7 +86,7 @@ class { '::foreman':
     it { is_expected.to be_listening }
   end
 
-  describe command("curl -s --cacert /etc/foreman/certificate.pem https://#{host_inventory['fqdn']} -w '\%{redirect_url}' -o /dev/null") do
+  describe command("curl -s --cacert /etc/foreman/certificate.pem https://#{host_inventory['fqdn']} -w '\%{redirect_url}' -o /dev/null"), unless: os[:family] == 'debian' do
     its(:stdout) { is_expected.to eq("https://#{host_inventory['fqdn']}/users/login") }
     its(:exit_status) { is_expected.to eq 0 }
   end

spec/acceptance/foreman_rex_cockpit_spec.rb

@@ -77,7 +77,7 @@ class { 'foreman':
     it { is_expected.to be_listening }
   end
 
-  describe port(9999) do
+  describe port(19090) do
     it { is_expected.to be_listening.on('127.0.0.1').with('tcp') }
   end
 

spec/classes/foreman_cli_azure_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe 'foreman::cli::azure' do
+  let(:pre_condition) { 'include foreman::cli' }
+
+  context 'on redhat-7-x86_64' do
+    let(:facts) { on_supported_os['redhat-7-x86_64'] }
+    it { should contain_package('tfm-rubygem-hammer_cli_foreman_azure_rm') }
+  end
+end

spec/classes/plugin/azure_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
 describe 'foreman::plugin::azure' do
-  include_examples 'basic foreman plugin tests', 'azure'
+  include_examples 'basic foreman plugin tests', 'azure_rm'
 end

spec/classes/plugin/remote_execution_cockpit_spec.rb

@@ -64,8 +64,8 @@ class {'foreman':
         is_expected.to contain_foreman__config__apache__fragment('cockpit')
           .without_content
           .with_ssl_content(%r{^<Location /webcon>$})
-          .with_ssl_content(%r{^  RewriteRule /webcon/\(\.\*\)           ws://127\.0\.0\.1:9999/webcon/\$1 \[P\]$})
-          .with_ssl_content(%r{^  RewriteRule /webcon/\(\.\*\)           http://127\.0\.0\.1:9999/webcon/\$1 \[P\]$})
+          .with_ssl_content(%r{^  RewriteRule /webcon/\(\.\*\)           ws://127\.0\.0\.1:19090/webcon/\$1 \[P\]$})
+          .with_ssl_content(%r{^  RewriteRule /webcon/\(\.\*\)           http://127\.0\.0\.1:19090/webcon/\$1 \[P\]$})
       end
     end
   end