feat: add fedora server

Adds Fedora Server Linux distribution. Ref: #885 Signed-off-by: Ryan Johnson <[email protected]>
vmware-samples · Apr 23, 2024 · de4a9f6 · de4a9f6
1 parent cff34d1
commit de4a9f6
Show file tree

Hide file tree

Showing 22 changed files with 1,192 additions and 94 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -210,6 +210,15 @@ CentOS-Linux-7:
 
 ##############################################################################
 
+Fedora-Server-40:
+    extends: .packer-build
+    variables:
+        INPUT_PATH: "$SCRIPT_PATH/builds/linux/fedora/40/"
+        BUILD_VARS: "linux-fedora-40.pkrvars.hcl"
+        EXTRA_VAR_FILES: "-var-file=$CONFIG_PATH/network.pkrvars.hcl -var-file=$CONFIG_PATH/linux-storage.pkrvars.hcl"
+
+##############################################################################
+
 SUSE-Linux-Enterprise-Server-15:
     extends: .packer-build
     variables:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -42,7 +42,7 @@
   "[md]": {
     "editor.defaultFormatter": "DavidAnson.vscode-markdownlint",
     "editor.formatOnPaste": true,
-    "editor.formatOnSave": true,
+    "editor.formatOnSave": false,
     "editor.formatOnType": true,
     "editor.trimAutoWhitespace": true,
     "editor.wordWrap": "bounded",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,12 +6,14 @@
 
 **Enhancement**:
 
-- Adds Ubuntu Server 24.04 LTS to the project.
-  [#891](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/891)
 - Adds a script (`./download.sh`) and a configuration (`project.json`) to assist in the download of
   the guest operating systems.
   [#874](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/874),
   [#877](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/877)
+- Adds Ubuntu Server 24.04 LTS to the project.
+  [#891](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/891)
+- Adds Fedora Server 40 Linux distribution to the project.
+  [#xxx](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/xxx)
 - Adds option to enable cloud-init on Debian 12.
   [#883](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/883)
 - Adds option to enable cloud-init on Red Hat Enterprise Linux 9.

diff --git a/README.md b/README.md
@@ -43,6 +43,7 @@ This project supports the following guest operating systems:
 | CentOS Stream                | 9         |
 | CentOS Stream                | 8         |
 | CentOS Linux                 | 7         |
+| Fedora Server                | 39        |
 | SUSE Linux Enterprise Server | 15        |
 
 ## Microsoft Windows

diff --git a/ansible/roles/base/tasks/linux.yml b/ansible/roles/base/tasks/linux.yml
@@ -70,35 +70,38 @@
 
 - block:
   - name: "Updating the operating system."
-    yum:
+    dnf:
       name: "*"
       state: latest     # noqa package-latest
       update_cache: true
 
+  - name: "Installing Cloud-init."
+    dnf:
+      name: cloud-init
+      state: latest
+    when: enable_cloudinit == 'true'
+
   - name: "Installing additional packages."
-    yum:
+    dnf:
       name: "{{ additional_packages[ansible_os_family] }}"
       state: latest     # noqa package-latest
-  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int < 8
+  when:
+    - ansible_distribution == 'Fedora' and ansible_distribution_major_version | int >= 40
+    - ansible_os_family == 'RedHat' and ansible_distribution_major_version | int >= 8
 
 - block:
   - name: "Updating the operating system."
-    dnf:
+    yum:
       name: "*"
       state: latest     # noqa package-latest
       update_cache: true
 
-  - name: "Installing Cloud-init."
-    dnf:
-      name: cloud-init
-      state: latest
-    when: enable_cloudinit == 'true'
-
   - name: "Installing additional packages."
-    dnf:
+    yum:
       name: "{{ additional_packages[ansible_os_family] }}"
       state: latest     # noqa package-latest
-  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int >= 8
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int < 8
+
 
 # SUSE Linux Enterprise Server
 

diff --git a/ansible/roles/configure/tasks/redhat.yml b/ansible/roles/configure/tasks/redhat.yml
@@ -6,7 +6,7 @@
   when: ansible_distribution == 'RedHat'
 
 # Tasks for configuring SSH for public key authentication.
-- name: "Configuring SSH for Public Key Authentication."
+- name: "Configuring SSH for Public Key Authentication without cloud-init."
   block:
     - lineinfile:
         path: /etc/ssh/sshd_config
@@ -17,6 +17,8 @@
         regexp: '^PubkeyAuthentication'
         line: 'PubkeyAuthentication yes'
   when: enable_cloudinit == 'false'
+
+- name: "Configuring SSH for Public Key Authentication without cloud-init."
   block:
     - lineinfile:
         path: /etc/ssh/sshd_config

diff --git a/build.sh b/build.sh
@@ -762,6 +762,43 @@ menu_option_19() {
 }
 
 menu_option_20() {
+  INPUT_PATH="$SCRIPT_PATH"/builds/linux/fedora/40/
+  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
+  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
+
+  echo -e "\nCONFIRM: Build a Fedora Server 40 Template for VMware vSphere?"
+  echo -e "\nContinue? (y/n)"
+  read -r REPLY
+  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+    exit 1
+  fi
+
+  ### Build a Fedora Server 40 Template for VMware vSphere. ###
+  echo "Building a Fedora Server 40 Template for VMware vSphere..."
+
+  ### Initialize HashiCorp Packer and required plugins. ###
+  echo "Initializing HashiCorp Packer and required plugins..."
+  packer init "$INPUT_PATH"
+
+  ### Start the Build. ###
+  echo "Starting the build...."
+  echo "packer build -force -on-error=ask $debug_option"
+  packer build -force -on-error=ask $debug_option \
+      -var-file="$CONFIG_PATH/vsphere.pkrvars.hcl" \
+      -var-file="$CONFIG_PATH/build.pkrvars.hcl" \
+      -var-file="$CONFIG_PATH/ansible.pkrvars.hcl" \
+      -var-file="$CONFIG_PATH/proxy.pkrvars.hcl" \
+      -var-file="$CONFIG_PATH/common.pkrvars.hcl" \
+      -var-file="$CONFIG_PATH/network.pkrvars.hcl" \
+      -var-file="$CONFIG_PATH/linux-storage.pkrvars.hcl" \
+      -var-file="$CONFIG_PATH/$BUILD_VARS" \
+      "$INPUT_PATH"
+
+  ### Build Complete. ###
+  echo "Build Complete."
+}
+
+menu_option_21() {
   INPUT_PATH="$SCRIPT_PATH"/builds/linux/sles/15/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -798,7 +835,7 @@ menu_option_20() {
 }
 
 
-menu_option_21() {
+menu_option_22() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2025/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -833,7 +870,7 @@ menu_option_21() {
   echo "Build Complete."
 }
 
-menu_option_22() {
+menu_option_23() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2025/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -869,7 +906,7 @@ menu_option_22() {
   echo "Build Complete."
 }
 
-menu_option_23() {
+menu_option_24() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2025/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -905,7 +942,7 @@ menu_option_23() {
   echo "Build Complete."
 }
 
-menu_option_24() {
+menu_option_25() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2022/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -940,7 +977,7 @@ menu_option_24() {
   echo "Build Complete."
 }
 
-menu_option_25() {
+menu_option_26() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2022/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -976,7 +1013,7 @@ menu_option_25() {
   echo "Build Complete."
 }
 
-menu_option_26() {
+menu_option_27() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2022/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1012,7 +1049,7 @@ menu_option_26() {
   echo "Build Complete."
 }
 
-menu_option_27() {
+menu_option_28() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2019/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1047,7 +1084,7 @@ menu_option_27() {
   echo "Build Complete."
 }
 
-menu_option_28() {
+menu_option_29() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2019/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1083,7 +1120,7 @@ menu_option_28() {
   echo "Build Complete."
 }
 
-menu_option_29() {
+menu_option_30() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2019/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1119,7 +1156,7 @@ menu_option_29() {
   echo "Build Complete."
 }
 
-menu_option_30() {
+menu_option_31() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/11/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1154,7 +1191,7 @@ menu_option_30() {
   echo "Build Complete."
 }
 
-menu_option_31() {
+menu_option_32() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/11/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1190,7 +1227,7 @@ menu_option_31() {
   echo "Build Complete."
 }
 
-menu_option_32() {
+menu_option_33() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/11/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1226,7 +1263,7 @@ menu_option_32() {
   echo "Build Complete."
 }
 
-menu_option_33() {
+menu_option_34() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/10/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1261,7 +1298,7 @@ menu_option_33() {
   echo "Build Complete."
 }
 
-menu_option_34() {
+menu_option_35() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/10/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1297,7 +1334,7 @@ menu_option_34() {
   echo "Build Complete."
 }
 
-menu_option_35() {
+menu_option_36() {
   INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/10/
   BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
   BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1378,25 +1415,26 @@ until [ "$selection" = "0" ]; do
   echo "    	17  -  CentOS Stream 9"
   echo "    	18  -  CentOS Stream 8"
   echo "    	19  -  CentOS Linux 7"
-  echo "    	20  -  SUSE Linux Enterprise Server 15"
+  echo "    	20  -  Fedora Server 40"
+  echo "    	21  -  SUSE Linux Enterprise Server 15"
   echo ""
   echo "      Microsoft Windows:"
   echo ""
-  echo "    	21  -  Windows Server 2025 - All"
-  echo "    	22  -  Windows Server 2025 - Standard Only"
-  echo "    	23  -  Windows Server 2025 - Datacenter Only"
-  echo "    	24  -  Windows Server 2022 - All"
-  echo "    	25  -  Windows Server 2022 - Standard Only"
-  echo "    	26  -  Windows Server 2022 - Datacenter Only"
-  echo "    	27  -  Windows Server 2019 - All"
-  echo "    	28  -  Windows Server 2019 - Standard Only"
-  echo "    	29  -  Windows Server 2019 - Datacenter Only"
-  echo "    	30  -  Windows 11 - All"
-  echo "    	31  -  Windows 11 - Enterprise Only"
-  echo "    	32  -  Windows 11 - Professional Only"
-  echo "    	33  -  Windows 10 - All"
-  echo "    	34  -  Windows 10 - Enterprise Only"
-  echo "    	35  -  Windows 10 - Professional Only"
+  echo "    	22  -  Windows Server 2025 - All"
+  echo "    	23  -  Windows Server 2025 - Standard Only"
+  echo "    	24  -  Windows Server 2025 - Datacenter Only"
+  echo "    	25  -  Windows Server 2022 - All"
+  echo "    	26  -  Windows Server 2022 - Standard Only"
+  echo "    	27  -  Windows Server 2022 - Datacenter Only"
+  echo "    	28  -  Windows Server 2019 - All"
+  echo "    	29  -  Windows Server 2019 - Standard Only"
+  echo "    	30  -  Windows Server 2019 - Datacenter Only"
+  echo "    	31  -  Windows 11 - All"
+  echo "    	32  -  Windows 11 - Enterprise Only"
+  echo "    	33  -  Windows 11 - Professional Only"
+  echo "    	34  -  Windows 10 - All"
+  echo "    	35  -  Windows 10 - Enterprise Only"
+  echo "    	36  -  Windows 10 - Professional Only"
   echo ""
   echo "      Other:"
   echo ""
@@ -1441,6 +1479,7 @@ until [ "$selection" = "0" ]; do
     33 ) clear ; menu_option_33 ; press_enter ;;
     34 ) clear ; menu_option_34 ; press_enter ;;
     35 ) clear ; menu_option_35 ; press_enter ;;
+    36 ) clear ; menu_option_36 ; press_enter ;;
     i|I ) clear ; info ; press_enter ;;
     q|Q ) clear ; exit ;;
     * ) clear ; incorrect_selection ; press_enter ;;

diff --git a/build.yaml b/build.yaml
@@ -124,6 +124,12 @@ menu:
           var_files:
             - "network.pkrvars.hcl"
             - "linux-storage.pkrvars.hcl"
+      - entry: "Fedora Server 40"
+        build:
+          path: "builds/linux/fedora/40/"
+          var_files:
+            - "network.pkrvars.hcl"
+            - "linux-storage.pkrvars.hcl"
       - entry: "SUSE Linux Enterprise Server 15"
         build:
           path: "builds/linux/sles/15/"