Replacing AlmaLinux with Rocky Linux

saltstack · Mar 22, 2024 · 6db5256 · 6db5256
1 parent 96494c4
commit 6db5256
Show file tree

Hide file tree

Showing 29 changed files with 397 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,11 +46,11 @@ jobs:
               - added|modified: &os_images_scripts
                 - os-images/files/*
                 - os-images/AWS/files/*
-            os-images-almalinux:
+            os-images-rockylinux:
               - added|modified:
                 - *state_tree_added_modified
                 - *os_images_scripts
-                - os-images/AWS/almalinux/*.hcl
+                - os-images/AWS/rockylinux/*.hcl
             os-images-amazonlinux:
               - added|modified:
                 - *state_tree_added_modified
@@ -175,15 +175,15 @@ jobs:
     with:
       changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
 
-  almalinux:
-    name: AlmaLinux
+  rockylinux:
+    name: RockyLinux
     needs:
       - collect-jobs
       - get-changed-files
-    if: ${{ fromJSON(needs.collect-jobs.outputs.jobs)['os-images-almalinux'] }}
+    if: ${{ fromJSON(needs.collect-jobs.outputs.jobs)['os-images-rockylinux'] }}
     uses: ./.github/workflows/build-image-action.yml
     with:
-      distro-name: almalinux
+      distro-name: rockylinux
       changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
       runner-version: ${{ needs.collect-jobs.outputs.runner-version }}
 
@@ -314,7 +314,7 @@ jobs:
     needs:
       - collect-jobs
       - get-changed-files
-      - almalinux
+      - rockylinux
       - amazonlinux
       - amazonlinux2000
       - archlinux

diff --git a/golden-state-tree/os/init.sls b/golden-state-tree/os/init.sls
@@ -11,6 +11,8 @@ include:
   - os.centos
   {%- elif grains['os'] == 'CentOS Stream' %}
   - os.centos-stream
+  {%- elif grains['os'] == 'Rocky' %}
+  - os.rocky
   {%- elif grains['os'] == 'Debian' %}
   - os.debian
   {%- elif grains['os'] == 'Fedora' %}

diff --git a/golden-state-tree/os/rocky/config/init.sls b/golden-state-tree/os/rocky/config/init.sls
@@ -0,0 +1,8 @@
+include:
+  - config.path
+  - config.ulimits
+  - config.locale
+  - config.sssd
+  - config.timezone
+  - config.dhclient
+  - config.sshd_config
diff --git a/golden-state-tree/os/rocky/init.sls b/golden-state-tree/os/rocky/init.sls
@@ -0,0 +1,8 @@
+include:
+  - .config
+  - .pkgs
+  - download.vault
+
+  {%- if pillar.get('github_actions_runner', False) %}
+  - github-actions-runner
+  {%- endif %}
diff --git a/golden-state-tree/os/rocky/pkgs/epel-release.sls b/golden-state-tree/os/rocky/pkgs/epel-release.sls
@@ -0,0 +1,3 @@
+rocky-epel-release:
+  pkg.installed:
+    - aggregate: False
diff --git a/golden-state-tree/os/rocky/pkgs/init.sls b/golden-state-tree/os/rocky/pkgs/init.sls
@@ -0,0 +1,42 @@
+include:
+  - pkgs.cron
+  - pkgs.curl
+  - pkgs.dmidecode
+  - pkgs.dnsutils
+  - pkgs.docker
+  - pkgs.gcc
+  - pkgs.gpg
+  - pkgs.ipset
+  - pkgs.libcurl
+  - pkgs.libffi
+  - pkgs.libgit2
+  - pkgs.libsodium
+  - pkgs.libxml
+  - pkgs.libxslt
+  - pkgs.make
+  - pkgs.man
+  - pkgs.nginx
+  - pkgs.openldap
+  - pkgs.openssl
+  - pkgs.openssl-dev
+  - pkgs.patch
+  - pkgs.python3
+  - pkgs.python3-pip
+  - pkgs.rng-tools
+  - pkgs.rpmdevtools
+  - pkgs.rsync
+  - pkgs.sed
+  - pkgs.swig
+  - pkgs.tar
+  - pkgs.zlib
+  - pkgs.vault
+  - pkgs.jq
+  - pkgs.xz
+  - pkgs.tree
+  - pkgs.cargo {#-
+  - pkgs.awscli
+  - pkgs.amazon-cloudwatch-agent #}
+  - pkgs.samba
+
+  {#- OS Specific packages install #}
+  - .rocky-epel-release
diff --git a/golden-state-tree/pkgs/libgit2.sls b/golden-state-tree/pkgs/libgit2.sls
@@ -6,7 +6,7 @@
   {%- set libgit2 = "libgit2" %}
 {%- endif %}
 
-{%- if grains['os'] in ('AlmaLinux', 'CentOS', 'CentOS Stream') %}
+{%- if grains['os'] in ('AlmaLinux', 'Rocky', 'CentOS', 'CentOS Stream') %}
 include:
   - os.centos-stream.pkgs.epel-release
 {%- elif grains['oscodename'] == 'Amazon Linux 2' %}

diff --git a/golden-state-tree/pkgs/libsodium.sls b/golden-state-tree/pkgs/libsodium.sls
@@ -9,7 +9,7 @@
   {%- set libsodium = 'libsodium' %}
 {%- endif %}
 
-{%- if grains['os'] in ('AlmaLinux', 'CentOS', 'CentOS Stream') %}
+{%- if grains['os'] in ('AlmaLinux', 'Rocky', 'CentOS', 'CentOS Stream') %}
 include:
   - os.centos-stream.pkgs.epel-release
 {%- elif grains['oscodename'] == 'Amazon Linux 2' %}

diff --git a/golden-state-tree/pkgs/libxml.sls b/golden-state-tree/pkgs/libxml.sls
@@ -1,6 +1,6 @@
 {%- if grains['os'] in ['Ubuntu', 'Debian'] %}
   {%- set libxml2 = "libxml2-dev" %}
-{%- elif grains['os'] in ['AlmaLinux', 'Fedora', 'CentOS', 'CentOS Stream'] or grains.os_family == 'Suse' %}
+{%- elif grains['os'] in ['AlmaLinux', 'Fedora', 'Rocky', 'CentOS', 'CentOS Stream'] or grains.os_family == 'Suse' %}
   {%- set libxml2 = "libxml2-devel" %}
 {%- else %}
   {%- set libxml2 = "libxml2" %}

diff --git a/golden-state-tree/pkgs/libxslt.sls b/golden-state-tree/pkgs/libxslt.sls
@@ -1,6 +1,6 @@
 {%- if grains['os'] in ['Ubuntu', 'Debian'] %}
   {%- set libxslt = "libxslt1-dev" %}
-{%- elif grains['os'] in ['AlmaLinux', 'Fedora', 'CentOS', 'CentOS Stream', 'VMware Photon OS'] or grains.os_family == 'Suse' %}
+{%- elif grains['os'] in ['AlmaLinux', 'Fedora', 'Rocky', 'CentOS', 'CentOS Stream', 'VMware Photon OS'] or grains.os_family == 'Suse' %}
   {%- set libxslt = "libxslt-devel" %}
 {%- else %}
   {%- set libxslt = "libxslt" %}

diff --git a/golden-state-tree/pkgs/python3.sls b/golden-state-tree/pkgs/python3.sls
@@ -4,7 +4,7 @@
   {%- set python3_dev = 'python3-devel' %}
 {%- elif grains['os'] == 'Fedora' %}
   {%- set python3_dev = 'python3-devel' %}
-{%- elif grains['os'] in ('AlmaLinux', 'CentOS', 'CentOS Stream', 'RedHat') %}
+{%- elif grains['os'] in ('AlmaLinux', 'Rocky', 'CentOS', 'CentOS Stream', 'RedHat') %}
   {%- if grains['osrelease'].startswith('8') %}
     {%- set python3_dev = 'python36-devel' %}
   {%- elif grains['osrelease'].startswith('9') %}

diff --git a/golden-state-tree/pkgs/swig.sls b/golden-state-tree/pkgs/swig.sls
@@ -1,19 +1,26 @@
 {%- if grains['os'] == 'CentOS Stream' and grains['osmajorrelease'] >= 9 %}
 centos-crb-repo:
   pkgrepo.managed:
-    - hunamename: CentOS Stream $releasever - CRB
+    - humanname: CentOS Stream $releasever - CRB
     - mirrorlist: https://mirrors.centos.org/metalink?repo=centos-crb-$stream&arch=$basearch&protocol=https,http
     - gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
     - gpgcheck: 1
     - enabled: 1
 {%- elif grains['os'] == 'AlmaLinux' and grains['osmajorrelease'] >= 9 %}
 centos-crb-repo:
   pkgrepo.managed:
-    - hunamename: AlmaLinux $releasever - CRB
+    - humanname: AlmaLinux $releasever - CRB
     - mirrorlist: https://mirrors.almalinux.org/mirrorlist/$releasever/crb
     - gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
     - gpgcheck: 1
     - enabled: 1
+{%- elif grains['os'] == 'Rocky' and grains['osmajorrelease'] >= 9 %}
+rocky-crb-repo:
+  pkgrepo.managed:
+    - humanname: Rocky $releasever - CRB
+    - name: crb
+    - gpgcheck: 1
+    - enabled: 1
 {%- endif %}
 
 swig:

diff --git a/os-images/AWS/almalinux/almalinux.pkr.hcl b/os-images/AWS/almalinux/almalinux.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3005.1+2103.gc1fc63d39a"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/amazonlinux/amazonlinux.pkr.hcl b/os-images/AWS/amazonlinux/amazonlinux.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3005.1+2103.gc1fc63d39a"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/amazonlinux2000/amazonlinux2000.pkr.hcl b/os-images/AWS/amazonlinux2000/amazonlinux2000.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.2"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/archlinux/archlinux.pkr.hcl b/os-images/AWS/archlinux/archlinux.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.2"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/centos/centos.pkr.hcl b/os-images/AWS/centos/centos.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/debian/debian.pkr.hcl b/os-images/AWS/debian/debian.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/fedora/fedora.pkr.hcl b/os-images/AWS/fedora/fedora.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/opensuse/opensuse.pkr.hcl b/os-images/AWS/opensuse/opensuse.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/photon/photon.pkr.hcl b/os-images/AWS/photon/photon.pkr.hcl
@@ -68,7 +68,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/rockylinux/rockylinux-8-arm64.pkrvars.hcl b/os-images/AWS/rockylinux/rockylinux-8-arm64.pkrvars.hcl
@@ -0,0 +1,2 @@
+ami_filter    = "Rocky-8-EC2-Base-8.9*aarch64"
+instance_type = "m6g.large"
diff --git a/os-images/AWS/rockylinux/rockylinux-8-x86_64.pkrvars.hcl b/os-images/AWS/rockylinux/rockylinux-8-x86_64.pkrvars.hcl
@@ -0,0 +1,2 @@
+ami_filter    = "Rocky-8-EC2-Base-8.9*x86_64"
+instance_type = "t3a.large"
diff --git a/os-images/AWS/rockylinux/rockylinux-9-arm64.pkrvars.hcl b/os-images/AWS/rockylinux/rockylinux-9-arm64.pkrvars.hcl
@@ -0,0 +1,2 @@
+ami_filter    = "Rocky-9-EC2-Base-9.3*aarch64"
+instance_type = "m6g.large"
diff --git a/os-images/AWS/rockylinux/rockylinux-9-x86_64.pkrvars.hcl b/os-images/AWS/rockylinux/rockylinux-9-x86_64.pkrvars.hcl
@@ -0,0 +1,2 @@
+ami_filter    = "Rocky-9-EC2-Base-9.3*x86_64"
+instance_type = "t3a.large"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ami_filter = "Rocky-8-EC2-Base-8.9*aarch64"
		instance_type = "m6g.large"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ami_filter = "Rocky-8-EC2-Base-8.9*x86_64"
		instance_type = "t3a.large"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ami_filter = "Rocky-9-EC2-Base-9.3*aarch64"
		instance_type = "m6g.large"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ami_filter = "Rocky-9-EC2-Base-9.3*x86_64"
		instance_type = "t3a.large"