foreman_ansible 14.2.1 → 14.2.3

data/app/models/ansible_role.rb

@@ -4,6 +4,7 @@
 class AnsibleRole < ApplicationRecord
   audited
   include Authorizable
+  include Foreman::ObservableModel
 
   self.include_root_in_json = false
   validates :name, :presence => true, :uniqueness => true
@@ -28,6 +29,8 @@ class AnsibleRole < ApplicationRecord
   scoped_search :relation => :hostgroups,
                 :on => :name, :rename => :hostgroup, :only_explicit => true
 
+  set_crud_hooks :ansible_role
+
   apipie :class, "A class representing #{model_name.human} object" do
     name 'Ansible role'
     refs 'AnsibleRole'

data/app/models/ansible_variable.rb

@@ -2,6 +2,8 @@
 
 # Represents the variables used in Ansible to parameterize playbooks
 class AnsibleVariable < LookupKey
+  include Foreman::ObservableModel
+
   belongs_to :ansible_role, :inverse_of => :ansible_variables
   validates :ansible_role_id, :presence => true
   before_validation :cast_default_value, :if => :override?
@@ -11,6 +13,8 @@ class AnsibleVariable < LookupKey
   scoped_search :relation => :ansible_role, :on => :name,
                 :complete_value => true, :rename => :ansible_role
 
+  set_crud_hooks :ansible_variable
+
   def ansible?
     true
   end

data/app/models/host_ansible_role.rb

@@ -2,10 +2,16 @@
 
 # Join model that hosts the connection between hosts and ansible_roles
 class HostAnsibleRole < ApplicationRecord
+  audited associated_with: :host
+
   belongs_to_host
   belongs_to :ansible_role
   acts_as_list scope: :host
 
   validates :ansible_role_id, :presence => true,
                               :uniqueness => { :scope => :host_id }
+
+  def to_label
+    ansible_role.name
+  end
 end

data/app/views/foreman_ansible/job_templates/capsule_update_-_ansible_default.erb

@@ -0,0 +1,73 @@
+<%#
+name: Capsule Update Playbook
+snippet: false
+template_inputs:
+- name: whitelist_options
+  required: false
+  input_type: user
+  advanced: false
+  value_type: plain
+  hidden_value: false
+model: JobTemplate
+job_category: Maintenance Operations
+description_format: "%{template_name}"
+provider_type: Ansible
+kind: job_template
+feature: ansible_run_capsule_update
+%>
+
+---
+- hosts: all
+  tasks:
+<% if plugin_present?('foreman_theme_satellite') -%>
+    - name: Gather the rpm package facts
+      package_facts:
+        manager: auto
+
+    - name: Fail if the target server is a Satellite server
+      fail:
+        msg: "This playbook cannot be executed on a Satellite server. Use only on a Capsule server."
+      when: "'satellite' in ansible_facts.packages"
+
+    - name: Install|Update satellite-maintain if not present
+      package:
+        name: rubygem-foreman_maintain
+        state: latest
+
+    - block:
+      <%- whitelist_option = if input('whitelist_options').present?
+                               "--whitelist=#{input('whitelist_options')}"
+                             end -%>
+      - name: Update Capsule server using satellite-maintain
+        shell: satellite-maintain update run --assumeyes <%= whitelist_option %>
+        register: result
+
+      - name: Re-Gather the rpm package facts after the update
+        package_facts:
+          manager: auto
+
+      - name: satellite-maintain update return code is zero
+        debug:
+          msg: "Success! Capsule server update completed. Current version of Capsule server server is {{ ansible_facts.packages['satellite-capsule'][0]['version'] }}."
+
+      rescue:
+        - name: Print satellite-maintain output
+          debug:
+            var: result
+
+        - name: Grep top 10 Error messages from /var/log/foreman-installer/capsule.log
+          shell: grep '^\[ERROR' /var/log/foreman-installer/capsule.log | head -n10
+          register: output_grep
+
+        - name: Print grepped Error messages
+          debug:
+            var: output_grep.stdout_lines
+
+        - name: satellite-maintain update return code is non-zero
+          fail:
+            msg: "Failed! Capsule server update failed. See /var/log/foreman-installer/capsule.log in the Capsule server for more information"
+<% else -%>
+    - name: Fail if foreman_theme_satellite is missing
+      fail:
+        msg: "Failed! The plugin foreman_theme_satellite is not present. This playbook is only for use with Satellite."
+<% end -%>

data/app/views/foreman_ansible/job_templates/capsule_upgrade_-_ansible_default.erb

@@ -24,8 +24,6 @@ feature: ansible_run_capsule_upgrade
 
 ---
 - hosts: all
-  vars:
-    target_version: "<%= input('target_version').present? ? input('target_version') : product_short_version %>"
   tasks:
 <% if plugin_present?('foreman_theme_satellite') -%>
     - name: Gather the rpm package facts
@@ -47,7 +45,7 @@ feature: ansible_run_capsule_upgrade
                                "--whitelist=#{input('whitelist_options')}"
                              end -%>
       - name: Upgrade Capsule server using satellite-maintain
-        shell: satellite-maintain upgrade run --assumeyes --target-version={{ target_version }} <%= whitelist_option %>
+        shell: satellite-maintain upgrade run --assumeyes <%= whitelist_option %>
         register: result
 
       - name: Re-Gather the rpm package facts after the upgrade

data/app/views/foreman_ansible/job_templates/convert_to_rhel.erb

@@ -20,11 +20,25 @@ template_inputs:
   advanced: false
   value_type: plain
   hidden_value: false
+- name: ELS
+  required: false
+  input_type: user
+  description: Use an Extended Lifecycle Support (ELS) add-on subscription
+  advanced: false
+  value_type: plain
+  options: "yes\r\nno"
+  default: "no"
+  hidden_value: false
 model: JobTemplate
 job_category: Convert 2 RHEL
 provider_type: Ansible
 kind: job_template
 %>
+<%-
+  ack = " --activationkey \"#{input_resource('Activation Key').name}\""
+  org = " --org \"#{@host.organization.label}\""
+  els = input('ELS') == "yes" ? " --els" : ""
+-%>
 ---
 - hosts: all
   environment:
@@ -53,7 +67,7 @@ kind: job_template
         - "convert2rhel_version is version('2.0.0', '<')"
 
     - name: Start convert2rhel
-      command: convert2rhel -y --activationkey "<%= input_resource('Activation Key').name %>" --org "<%= @host.organization.label %>"
+      command: convert2rhel -y <%= ack + org + els %>
 
 <%- if input('Restart') == "yes" -%>
     - name: Reboot the machine

data/lib/foreman_ansible/remote_execution.rb

@@ -40,6 +40,12 @@ module ForemanAnsible
         :description => N_('Upgrade Capsules on given Capsule server hosts'),
         :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
       )
+      RemoteExecutionFeature.register(
+        :ansible_run_capsule_update,
+        N_('Update Capsules on given hosts'),
+        :description => N_('Update Capsules on given Capsule server hosts'),
+        :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
+      )
     end
   end
 end

data/lib/foreman_ansible/version.rb

@@ -4,5 +4,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '14.2.1'
+  VERSION = '14.2.3'
 end