Version 1.9.8

2022-06-23 08-59-47Z 001 002 2022-06-25 14-01-35Z
marcinbojko · Jun 25, 2022 · fbc479f · fbc479f
1 parent 8c16710
commit fbc479f
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 42 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -98,7 +98,7 @@ alma85:
     - docker:$dind
   before_script:
     - export template_file="./templates/hv_almalinux8_g2.pkr.hcl"
-    - export var_file="./variables/variables_almalinux85.pkvars.hcl"
+    - export var_file="./variables/variables_almalinux86.pkvars.hcl"
   script:
     - ./packer version --version
     - ./packer validate -var-file="$var_file" "$template_file"
@@ -114,7 +114,7 @@ alma85-vagrant:
     - docker:$dind
   before_script:
     - export template_file="./templates/hv_almalinux8_g2_vagrant.pkr.hcl"
-    - export var_file="./variables/variables_almalinux85.pkvars.hcl"
+    - export var_file="./variables/variables_almalinux86.pkvars.hcl"
   script:
     - ./packer version --version
     - ./packer validate -var-file="$var_file" "$template_file"
@@ -130,7 +130,7 @@ alma85-docker:
     - docker:$dind
   before_script:
     - export template_file="./templates/hv_almalinux8_g2_docker.pkr.hcl"
-    - export var_file="./variables/variables_almalinux85.pkvars.hcl"
+    - export var_file="./variables/variables_almalinux86.pkvars.hcl"
   script:
     - ./packer version --version
     - ./packer validate -var-file="$var_file" "$template_file"
@@ -417,7 +417,7 @@ build_alma:
     - "Get-Vm -name packer-*|Stop-VM -Force"
     - Sleep 120
     - "Get-Vm -name packer-*|Remove-VM -Force"
-    - .\hv_almalinux85.ps1
+    - .\hv_almalinux86.ps1
   rules:
     - if: $build_alma == "true"
       when: on_success
@@ -432,8 +432,7 @@ build_alma_docker:
     - "Get-Vm -name packer-*|Stop-VM -Force"
     - Sleep 120
     - "Get-Vm -name packer-*|Remove-VM -Force"
-    - .\hv_almalinux85_docker.ps1
-    - .\hv_almalinux85_vagrant.ps1
+    - .\hv_almalinux86_docker.ps1
   rules:
     - if: $build_alma == "true"
       when: on_success
@@ -450,7 +449,7 @@ build_alma_vagrant:
     - "Get-Vm -name packer-*|Stop-VM -Force"
     - Sleep 120
     - "Get-Vm -name packer-*|Remove-VM -Force"
-    - .\hv_almalinux85_vagrant.ps1
+    - .\hv_almalinux86_vagrant.ps1
   rules:
     - if: $build_alma == "true"
       when: on_success

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## version 1.9.7 2022-06-22
+## Version 1.9.8 2022-06-25
+
+* [AlmaLinux] added `AlmaLinux 8.6`
+
+## Version 1.9.7 2022-06-22
 
 * `extra` scripts and playbooks optimizations
 * [RockyLinux] added `RockyLinux 8.6`

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
   - [Scripts](#scripts)
     - [Windows Machines](#windows-machines)
     - [Linux Machines](#linux-machines)
-      - [Ansible Playbooks CentOS/AlmaLinux/RockyLinux](#ansible-playbooks-centosalmalinuxrockylinux)
+      - [Ansible Playbooks CentOS/AlmaLinux/RockyLinux/OracleLinux](#ansible-playbooks-centosalmalinuxrockylinuxoraclelinux)
   - [Templates Windows 2022](#templates-windows-2022)
     - [Hyper-V Generation 2 Windows Server 2022 Standard Image](#hyper-v-generation-2-windows-server-2022-standard-image)
       - [Standard Generation 2 Prerequisites](#standard-generation-2-prerequisites)
@@ -50,9 +50,9 @@
     - [Hyper-V Generation 2 OracleLinux 8.6 image with extra docker volume](#hyper-v-generation-2-oraclelinux-86-image-with-extra-docker-volume)
   - [Templates AlmaLinux 8.x](#templates-almalinux-8x)
     - [Warnings - AlmaLinux 8](#warnings---almalinux-8)
-    - [Hyper-V Generation 2 AlmaLinux 8.5 Image](#hyper-v-generation-2-almalinux-85-image)
-    - [Hyper-V Generation 2 AlmaLinux 8.5 Vagrant support](#hyper-v-generation-2-almalinux-85-vagrant-support)
-    - [Hyper-V Generation 2 AlmaLinux 8.5 image with extra docker volume](#hyper-v-generation-2-almalinux-85-image-with-extra-docker-volume)
+    - [Hyper-V Generation 2 AlmaLinux 8.6 Image](#hyper-v-generation-2-almalinux-86-image)
+    - [Hyper-V Generation 2 AlmaLinux 8.6 Vagrant support](#hyper-v-generation-2-almalinux-86-vagrant-support)
+    - [Hyper-V Generation 2 AlmaLinux 8.6 image with extra docker volume](#hyper-v-generation-2-almalinux-86-image-with-extra-docker-volume)
   - [Templates CentOS 7.x](#templates-centos-7x)
     - [Warnings - CentOS Docker](#warnings---centos-docker)
     - [Hyper-V Generation 2 CentOS 7.9](#hyper-v-generation-2-centos-79)
@@ -74,7 +74,7 @@
 <!-- /TOC -->
 ## Requirements
 
-- packer <=`1.7.10`. Do not use packer below 1.7.0 version. For previous packer versions use previous releases from this repository
+- packer <=`1.8.1`. Do not use packer below 1.7.0 version. For previous packer versions use previous releases from this repository
 - Microsoft Hyper-V Server 2016/2019 or Microsoft Windows Server 2016/2019 (not 2012/R2) with Hyper-V role installed as host to build your images
 - firewall exceptions for `packer` http server (look down below)
 - [OPTIONAL] Vagrant >= `2.2.19` - for `vagrant` version of scripts. Boxes (prebuilt) are already available here: [https://app.vagrantup.com/marcinbojko](https://app.vagrantup.com/marcinbojko)
@@ -86,7 +86,7 @@
 ### Install packer from Chocolatey
 
 ```cmd
-choco install packer --version=1.7.10 -y
+choco install packer --version=1.8.1 -y
 ```
 
 ### Install vagrant from Chocolatey
@@ -185,7 +185,7 @@ To adjust to your Hyper-V, please check variables below and/or in ./variables fi
 
   Be aware, turning off latest System Center Virtual Machine Agent will cause System Center fail to deploy machines
 
-#### Ansible Playbooks (CentOS/AlmaLinux/RockyLinux)
+#### Ansible Playbooks (CentOS/AlmaLinux/RockyLinux/OracleLinux)
 
 During deployment ansible-base and ansible are installed in operating system. After deployment ends, these packages are removed.
 Playbooks are held in `/extra/playbooks` folder, with proper OS variables.
@@ -456,17 +456,17 @@ Run `hv_oraclelinux86_docker.ps1` for OracleLinux 8.6
 - for Windows based machines adjust your settings in ./scripts/phase-2.ps1
 - for Linux based machines adjust your settings in ./files/gen2-centos/provision.sh and ./files/gen2-centos/puppet.conf
 
-### Hyper-V Generation 2 AlmaLinux 8.5 Image
+### Hyper-V Generation 2 AlmaLinux 8.6 Image
 
-Run `hv_almalinux85.ps1`
+Run `hv_almalinux86.ps1`
 
-### Hyper-V Generation 2 AlmaLinux 8.5 Vagrant support
+### Hyper-V Generation 2 AlmaLinux 8.6 Vagrant support
 
-Run `hv_almalinux85_vagrant.ps1` for AlmaLinux 8.5
+Run `hv_almalinux86_vagrant.ps1` for AlmaLinux 8.6
 
-### Hyper-V Generation 2 AlmaLinux 8.5 image with extra docker volume
+### Hyper-V Generation 2 AlmaLinux 8.6 image with extra docker volume
 
-Run `hv_almalinux85_docker.ps1` for AlmaLinux 8.5
+Run `hv_almalinux86_docker.ps1` for AlmaLinux 8.6
 
 ## Templates CentOS 7.x
 

diff --git a/extra/playbooks/provision_alma8_variables.yml b/extra/playbooks/provision_alma8_variables.yml
@@ -37,7 +37,7 @@ yum_extra_packages:
   - screen
   - smartmontools
   - sssd
-  - sssd-libwbclient
+  - sssd-tools
   - telnet
   - tmux
   - xauth
@@ -69,7 +69,7 @@ webmin:
     enabled: 1
 zabbix:
   repository:
-    - url: https://repo.zabbix.com/zabbix/5.2/rhel/8/x86_64/zabbix-release-5.2-1.el8.noarch.rpm
+    - url: https://repo.zabbix.com/zabbix/6.0/rhel/8/x86_64/zabbix-release-6.0-1.el8.noarch.rpm
       name: zabbix-agent2
       file: /etc/yum.repos.d/zabbix.repo
       gpgkey: https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-A14FE591
@@ -81,16 +81,16 @@ zabbix:
     service: zabbix-agent2
 puppet:
   repository:
-    - url: https://yum.puppet.com/puppet6-release-el-8.noarch.rpm
+    - url: https://yum.puppet.com/puppet7-release-el-8.noarch.rpm
       gpgkey: https://yum.puppet.com/RPM-GPG-KEY-puppet-20250406
   service:
     - name: puppet
       state: stopped
       enabled: no
   priorities:
-    - name: puppet6
+    - name: puppet7
       priority: 20
-      path: /etc/yum.repos.d/puppet6.repo
+      path: /etc/yum.repos.d/puppet7.repo
   package:
     name: puppet-agent
   config:

diff --git a/extra/playbooks/provision_oracle8_variables.yml b/extra/playbooks/provision_oracle8_variables.yml
@@ -38,6 +38,7 @@ yum_extra_packages:
   - smartmontools
   - sssd
   - sssd-libwbclient
+  - sssd-tools
   - telnet
   - tmux
   - xauth

diff --git a/hv_almalinux85.ps1 → hv_almalinux86.ps1 b/hv_almalinux85.ps1 → hv_almalinux86.ps1
@@ -5,8 +5,8 @@ $startDTM = (Get-Date)
 
 # Variables
 $template_file="./templates/hv_almalinux8_g2.pkr.hcl"
-$var_file="./variables/variables_almalinux85.pkvars.hcl"
-$machine="AlmaLinux 8.5"
+$var_file="./variables/variables_almalinux86.pkvars.hcl"
+$machine="AlmaLinux 8.6"
 $packer_log=0
 
 if ((Test-Path -Path "$template_file") -and (Test-Path -Path "$var_file")) {

diff --git a/hv_almalinux85_docker.ps1 → hv_almalinux86_docker.ps1 b/hv_almalinux85_docker.ps1 → hv_almalinux86_docker.ps1
@@ -5,9 +5,9 @@ $startDTM = (Get-Date)
 
 # Variables
 $template_file="./templates/hv_almalinux8_g2_docker.pkr.hcl"
-$var_file="./variables/variables_almalinux85.pkvars.hcl"
+$var_file="./variables/variables_almalinux86.pkvars.hcl"
 $override="./variables/almalinux8_docker.yml"
-$machine="AlmaLinux 8.5"
+$machine="AlmaLinux 8.6"
 $packer_log=0
 
 if ((Test-Path -Path "$template_file") -and (Test-Path -Path "$var_file")) {

diff --git a/hv_almalinux85_vagrant.ps1 → hv_almalinux86_vagrant.ps1 b/hv_almalinux85_vagrant.ps1 → hv_almalinux86_vagrant.ps1
@@ -5,9 +5,9 @@ $startDTM = (Get-Date)
 
 # Variables
 $template_file="./templates/hv_almalinux8_g2_vagrant.pkr.hcl"
-$var_file="./variables/variables_almalinux85.pkvars.hcl"
-$vbox_file="./vbox/packer-almalinux85-g2.box"
-$machine="AlmaLinux 8.5"
+$var_file="./variables/variables_almalinux86.pkvars.hcl"
+$vbox_file="./vbox/packer-almalinux86-g2.box"
+$machine="AlmaLinux 8.6"
 $packer_log=0
 
 if ((Test-Path -Path "$template_file") -and (Test-Path -Path "$var_file")) {

diff --git a/vagrant/hv_almalinux85_g2.template → vagrant/hv_almalinux86_g2.template b/vagrant/hv_almalinux85_g2.template → vagrant/hv_almalinux86_g2.template
@@ -4,8 +4,8 @@
 Vagrant.require_version ">= 1.6.2"
 
 Vagrant.configure("2") do |config|
-    config.vm.define "vagrant-almalinux85"
-    config.vm.box = "almalinux85"
+    config.vm.define "vagrant-almalinux86"
+    config.vm.box = "almalinux86"
     config.vm.communicator = "ssh"
     config.vm.synced_folder ".", "/vagrant", type: "rsync", disabled: "true"
 

diff --git a/variables/variables_almalinux85.pkvars.hcl → variables/variables_almalinux86.pkvars.hcl b/variables/variables_almalinux85.pkvars.hcl → variables/variables_almalinux86.pkvars.hcl
@@ -1,17 +1,17 @@
-iso_url = "http://almalinux.slaskdatacenter.com/8.5/isos/x86_64/AlmaLinux-8.5-x86_64-dvd.iso"
+iso_url = "http://almalinux.slaskdatacenter.com/8.6/isos/x86_64/AlmaLinux-8.6-x86_64-dvd.iso"
 iso_checksum_type = "sha256"
-iso_checksum = "54b8881bebd924e4699ed12634187a82156fdb0fa57ec24058d04d70d2f033b3"
-vm_name = "packer-almalinux85-g2"
+iso_checksum = "8c3bd1ff3d88b5599147626fa2616d85edcc861ec00edd6863b81dbfb135874c"
+vm_name = "packer-almalinux86-g2"
 disk_size = "70000"
 disk_additional_size = ["150000"]
 switch_name = "vSwitch"
-output_directory = "output-almalinux85"
-output_vagrant = "./vbox/packer-almalinux85-g2.box"
+output_directory = "output-almalinux86"
+output_vagrant = "./vbox/packer-almalinux86-g2.box"
 vlan_id = ""
 memory = "4096"
 cpus = "2"
-vagrantfile_template = "./vagrant/hv_almalinux85_g2.template"
+vagrantfile_template = "./vagrant/hv_almalinux86_g2.template"
 ssh_password = "password"
 provision_script_options = "-z false"
-boot_command = "c  setparams 'kickstart' <enter> linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=AlmaLinux-8-5-x86_64-dvd inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/gen2-almalinux8/ks.cfg<enter> initrdefi /images/pxeboot/initrd.img<enter> boot<enter>"
+boot_command = "c  setparams 'kickstart' <enter> linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=AlmaLinux-8-6-x86_64-dvd inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/gen2-almalinux8/ks.cfg<enter> initrdefi /images/pxeboot/initrd.img<enter> boot<enter>"
 ansible_override = "variables/almalinux8.yml"