Merge pull request #1 from MonolithProjects/develop

Fixed the Debian/Ubuntu upgrade

Author: MonolithProjects

.github/workflows/main.yml

@@ -25,37 +25,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        config:
-          - image: "debian"
-            tag: "latest"
-          - image: "debian"
-            tag: "testing"
-          - image: "debian"
-            tag: "unstable"
-          - image: "centos"
-            tag: "7"
-          - image: "centos"
-            tag: "latest"
-          - image: "fedora"
-            tag: "30"
-          - image: "fedora"
-            tag: "latest"
-          - image: "fedora"
-            tag: "rawhide"
-          - image: "opensuse"
-            tag: "latest"
-          - image: "ubuntu"
-            tag: "latest"
-
     steps:
       - name: checkout
         uses: actions/checkout@v2
         with:
           path: "${{ github.repository }}"
       - name: molecule
         uses: robertdebock/molecule-action@2.0.0
-        with:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-          options: "--parallel all"

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Michal Muransky
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -5,20 +5,24 @@ System update
 <a href="https://galaxy.ansible.com/monolithprojects/system_update"><img src="https://img.shields.io/ansible/role/d/46110"/></a> 
 <a href="https://galaxy.ansible.com/monolithprojects/system_update"><img src="https://img.shields.io/github/v/release/MonolithProjects/ansible-system_update"/></a> 
 <a href="https://github.com/MonolithProjects/ansible-system_update/actions"><img src="https://github.com/MonolithProjects/ansible-system_update/workflows/molecule%20test/badge.svg?branch=master"/></a>
+<a href="https://galaxy.ansible.com/monolithprojects/system_update"><img src="https://img.shields.io/github/license/MonolithProjects/ansible-system_update"/></a>
 
 This role will update all packages on RHEL/CentOS and Debian/Ubuntu systems.  
 Optionally it can update the packages to specific distro release version (by default it is `latest`).
 Another feature is the `smart reboot` where system will be rebooted after the package you specified in `smart_reboot_pkg:` list will be updated.
 
 Requirements
 ------------
+
 System must have access to the packages repository (Internet, Red Hat Satellite, etc.).
 
 
 Role Variables
 --------------
+
 This is a copy from `defaults/main.yml`
-```
+
+```yaml
 # Autoremove unused dependency packages for all modules.
 autoremove_pkgs: no
 
@@ -30,23 +34,25 @@ autoremove_pkgs: no
 # Specifies the Linux distro release from which all packages will be installed.
 # By default the packages will be updated to the latest distro release.
 
-# Debian or Ubuntu release version
+# Debian or Ubuntu release version (example: xenial)
 # deb_release_ver:
 
-# RHEL/CentOS release version
+# RHEL/CentOS release version (example 6.10)
 # el6_release_ver:
 
-# RHEL/CentOS release version
+# RHEL/CentOS release version (exanple: 7.6.1810)
 # el7_release_ver:
 
-# RHEL/CentOS release version
+# RHEL/CentOS release version (example: 8.1.1911)
 # el8_release_ver:
 ```
 
 Example Playbook
 ----------------
+
 Simple example. All packages will be updated to the latest version.
-```
+
+```yaml
 ---
 - name: Example
   hosts: all
@@ -59,7 +65,7 @@ In this example `el7` system (RHEL7 or CentOS7) packages will be updated to the
 Using `autoremove_pkgs` the dependencies which are no longer needed will be autoremoved. 
 System will be rebooted if `kernel` or `dbus` package is updated.  
 
-```
+```yaml
 ---
 - name: Example
   hosts: all

defaults/main.yml

@@ -10,14 +10,14 @@ autoremove_pkgs: no
 # Specifies the Linux distro release from which all packages will be installed.
 # By default the packages will be updated to the latest distro release.
 
-# Debian or Ubuntu release version
+# Debian or Ubuntu release version (example: xenial)
 # deb_release_ver:
 
-# RHEL/CentOS release version
+# RHEL/CentOS release version (example 6.10)
 # el6_release_ver:
 
-# RHEL/CentOS release version
+# RHEL/CentOS release version (exanple: 7.6.1810)
 # el7_release_ver:
 
-# RHEL/CentOS release version
+# RHEL/CentOS release version (example: 8.1.1911)
 # el8_release_ver:

tasks/update_deb.yml

@@ -1,14 +1,27 @@
 ---
+- name: Update Debian/Ubuntu system to specific release
+  apt:
+    name: "*"
+    update_cache: yes
+    autoclean: yes
+    state: latest
+    default_release: "{{ deb_release_ver }}"
+    autoremove: "{{ autoremove_pkgs }}"
+  when:
+    - ansible_pkg_mgr == "apt" and deb_release_ver is defined
+  register: update_result_apt
+  until: update_result_apt is succeeded
+  retries: 3
+
 - name: Update Debian/Ubuntu system
   apt:
     name: "*"
     update_cache: yes
     autoclean: yes
     state: latest
-    default_release: "{% if deb_release_ver is defined %}{{ deb_release_ver }}{% else %}{{ ansible_distribution_major_version }}.*{% endif %}"
     autoremove: "{{ autoremove_pkgs }}"
   when:
-    - ansible_pkg_mgr == "apt"
+    - ansible_pkg_mgr == "apt" and deb_release_ver is not defined
   register: update_result_apt
   until: update_result_apt is succeeded
   retries: 3