sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
# Consul settings.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
consul_service_mgr: "systemd"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker daemon settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
# Consul settigs.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
consul_service_mgr: "systemd"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker daemon settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
# Consul settings.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
consul_service_mgr: "systemd"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker daemon settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
# Consul settigs.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
consul_service_mgr: "systemd"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker daemon settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
# Consul settigs.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
consul_service_mgr: "systemd"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker daemon settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
# Consul settigs.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
consul_service_mgr: "systemd"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker daemon settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
docker.privileged.enabled: true
docker.volumes.enabled: true
driver.whitelist: "docker,raw_exec,exec"
+ fingerprint.network.disallow_link_local: true
nomad_service_mgr: "systemd"
nomad_consul_use_ssl: false
nomad_use_tls: false
# Consul settings.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- - src: "{{ file_consul_agent_ca_pem }}"
+ - src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
- src: "{{ file_consul_server_0_pem }}"
dest: "{{ consul_cert_file }}"
consul_service_mgr: "systemd"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker daemon settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
docker.privileged.enabled: true
docker.volumes.enabled: true
driver.whitelist: "docker,raw_exec,exec"
+ fingerprint.network.disallow_link_local: true
nomad_service_mgr: "systemd"
nomad_consul_use_ssl: false
nomad_use_tls: false
# Consul settings.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- - src: "{{ file_consul_agent_ca_pem }}"
+ - src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
- src: "{{ file_consul_server_0_pem }}"
dest: "{{ consul_cert_file }}"
consul_service_mgr: "systemd"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker daemon settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
# Consul settigs.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
consul_service_mgr: "systemd"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
# Consul settigs.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
consul_service_mgr: "systemd"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
docker.privileged.enabled: true
docker.volumes.enabled: true
driver.whitelist: "docker,raw_exec,exec"
+ fingerprint.network.disallow_link_local: true
nomad_service_mgr: "systemd"
nomad_consul_use_ssl: false
nomad_use_tls: false
# Consul settings.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- - src: "{{ file_consul_agent_ca_pem }}"
+ - src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
- src: "{{ file_consul_server_0_pem }}"
dest: "{{ consul_cert_file }}"
#consul_package_version: "1.5.2+dfsg2-14"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker daemon settings.
docker_daemon:
sshd_disable_password_login: true
# Nomad settings.
-nomad_version: "1.6.1"
+nomad_version: "1.8.2"
nomad_certificates:
- src: "{{ file_nomad_ca_pem }}"
dest: "{{ nomad_tls_ca_file }}"
# Consul settings.
nomad_use_consul: true
+consul_version: "1.19.1"
consul_certificates:
- - src: "{{ file_consul_agent_ca_pem }}"
+ - src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
- src: "{{ file_consul_server_0_pem }}"
dest: "{{ consul_cert_file }}"
#consul_package_version: "1.5.2+dfsg2-14"
# Vault settings.
-vault_version: "1.13.1"
+vault_version: "1.17.2"
# Docker daemon settings.
docker_daemon:
---
-# file: roles/common/defaults/main.yaml
+# file: defaults/main.yaml
packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}"
- "python3-pip"
- "python3-pyelftools"
- "python3-setuptools"
+ noble:
+ - "build-essential"
+ - "libpcap-dev"
+ - "net-tools"
+ - "python3-all"
+ - "python3-apt"
+ - "python3-cffi"
+ - "python3-cffi-backend"
+ - "python3-dev"
+ - "python3-pip"
+ - "python3-pyelftools"
+ - "python3-setuptools"
packages_by_arch:
aarch64:
---
-# file: roles/common/handlers/main.yaml
+# file: handlers/main.yaml
- name: Reboot Server
ansible.builtin.reboot:
---
-# file: roles/common/tasks/main.yaml
+# file: tasks/main.yaml
-- name: Conf - Add permanent proxy settings
+- name: Add permanent proxy settings
ansible.builtin.lineinfile:
path: "/etc/environment"
state: "present"
tags:
- common-conf-proxy
-- name: Inst - Update package cache (apt)
+- name: Update Repositories Cache
ansible.builtin.apt:
update_cache: true
- cache_valid_time: 3600
when:
- - ansible_distribution|lower == 'ubuntu'
+ - ansible_os_family == 'Debian'
tags:
- common-inst-prerequisites
-- name: Inst - Prerequisites
+- name: Prerequisites
ansible.builtin.package:
name: "{{ packages | flatten(levels=1) }}"
state: "latest"
tags:
- common-inst-prerequisites
-- name: Inst - Meson (DPDK)
+- name: PIP management
+ ansible.builtin.file:
+ path: "/usr/lib/python3.12/EXTERNALLY-MANAGED"
+ state: "absent"
+ tags:
+ - common-inst-pip
+
+- name: Meson (DPDK)
ansible.builtin.pip:
name:
- "meson==0.64.1"
state: "forcereinstall"
+ environment:
+ ANSIBLE_SKIP_CONFLICT_CHECK: 1
tags:
- - common-inst-meson
+ - common-inst-pip
-- name: Conf - sudoers admin
+- name: sudoers admin
ansible.builtin.lineinfile:
path: "/etc/sudoers"
state: "present"
tags:
- common-conf-sudoers
-- name: Conf - sudoers nopasswd
+- name: sudoers nopasswd
ansible.builtin.lineinfile:
path: "/etc/sudoers"
state: "present"
# Conf - base.hcl
consul_allow_tls: true
consul_bind_addr: "{{ ansible_default_ipv4.address }}"
-consul_bootstrap_expect: 1
+consul_bootstrap_expect: 2
consul_client_addr: "0.0.0.0"
consul_datacenter: "dc1"
consul_disable_update_check: true
---
-# file: roles/docker/defaults/main.yaml
+# file: defaults/main.yaml
# Version options.
docker_edition: "ce"
---
-# file roles/docker/handlers/main.yaml
+# file handlers/main.yaml
- name: Restart Docker
ansible.builtin.service:
dependencies: []
galaxy_info:
- role_name: docker
- author: fd.io
- description: Docker-CE for Linux.
- company: none
- license: "license (Apache)"
- min_ansible_version: 2.9
+ role_name: "docker"
+ author: "pmikus"
+ description: "Docker-CE for Linux."
+ company: "none"
+ license: "license (BSD, MIT)"
+ min_ansible_version: "2.9"
platforms:
- - name: Ubuntu
+ - name: "Ubuntu"
versions:
- - jammy
+ - "jammy"
+ - name: "Debian"
+ versions:
+ - "bookworm"
galaxy_tags:
- - docker
+ - "docker"
---
-# file: roles/docker/tasks/ubuntu_jammy.yaml
+# file: tasks/Debian.yaml
-- name: Inst - Dependencies
+- name: "Install Dependencies"
ansible.builtin.apt:
name:
- "apt-transport-https"
tags:
- docker-inst-dependencies
-- name: Conf - Add APT Key
+- name: "Add APT Key"
ansible.builtin.apt_key:
url: "{{ docker_apt_gpg_key }}"
state: "{{ docker_apt_gpg_key_state }}"
tags:
- docker-conf-apt
-- name: Conf - Install APT Repository
+- name: "Install APT Repository"
ansible.builtin.apt_repository:
repo: "{{ docker_apt_repository }}"
state: "{{ docker_apt_repository_state }}"
---
-# file: roles/docker/tasks/main.yaml
+# file: tasks/main.yaml
-- include_tasks: "{{ ansible_distribution_release }}.yaml"
+- name: "Install Prerequisites Based on OS"
+ ansible.builtin.include_tasks:
+ file: "{{ item }}"
+ with_first_found:
+ - files:
+ - "{{ ansible_os_family }}.yaml"
+ - "default.yaml"
tags:
- docker-inst-dependencies
-- name: Inst - Docker
+- name: "Install Docker"
ansible.builtin.package:
name:
- "{{ docker_package }}"
tags:
- docker-inst-package
-- name: Conf - Docker Service
+- name: "Enable Docker Service"
ansible.builtin.service:
name: docker
state: "{{ docker_service_state }}"
tags:
- docker-conf-service
-- name: Conf - Docker Service Directory
+- name: "Docker Service Directory"
ansible.builtin.file:
path: "/etc/systemd/system/docker.service.d"
state: "directory"
tags:
- docker-conf-service
-- name: Conf - Docker Daemon
+- name: "Configure Docker Daemon"
ansible.builtin.template:
src: "templates/daemon.json.j2"
dest: "/etc/docker/daemon.json"
tags:
- docker-conf-daemon
-- name: Conf - Docker HTTP Proxy
+- name: "Configure Docker HTTP Proxy"
ansible.builtin.template:
src: "templates/docker.service.proxy.http"
dest: "/etc/systemd/system/docker.service.d/http-proxy.conf"
tags:
- docker-conf-service
-- name: Conf - Docker HTTPS Proxy
+- name: "Configure Docker HTTPS Proxy"
ansible.builtin.template:
src: "templates/docker.service.proxy.https"
dest: "/etc/systemd/system/docker.service.d/https-proxy.conf"
tags:
- docker-conf-service
-- name: Meta - Flush handlers
+- name: "Meta - Flush handlers"
ansible.builtin.meta: flush_handlers
intel_800_compatibility_matrix:
dpdk22.03:
# custom for vpp_device
- ice: "1.13.7"
+ ice: "1.14.13"
ddp: "1.3.45.0"
- iavf: "4.9.5"
+ iavf: "4.11.3"
nvm: "4.40"
dpdk22.07:
# https://doc.dpdk.org/guides/rel_notes/release_22_07.html
intel_ice_url:
"1.9.7": "ice%20stable/1.9.7/ice-1.9.7.tar.gz/download"
"1.13.7": "ice%20stable/1.13.7/ice-1.13.7.tar.gz/download"
+ "1.14.13": "ice%20stable/1.14.13/ice-1.14.13.tar.gz/download"
intel_iavf_url:
"4.3.19": "iavf%20stable/4.3.19/iavf-4.3.19.tar.gz/download"
"4.5.3": "iavf%20stable/4.5.3/iavf-4.5.3.tar.gz/download"
"4.9.5": "iavf%20stable/4.9.5/iavf-4.9.5.tar.gz/download"
+ "4.11.3": "iavf%20stable/4.11.3/iavf-4.11.3.tar.gz/download"
intel_ddp_url:
"1.3.37.0": "738733/800%20Series%20DDP%20Comms%20Package%201.3.37.0.zip"
nomad_consul_token: ""
nomad_consul_servers_service_name: "nomad"
nomad_consul_clients_service_name: "nomad-client"
-nomad_consul_tags: {}
+nomad_consul_tags: ""
nomad_consul_use_ssl: false
# ACLs
# Specifies optional Consul tags to be registered with the Nomad server and
# agent services.
- tags = {{ nomad_consul_tags | to_json }}
+ tags = "{{ nomad_consul_tags }}"
# Specifies the token used to provide a per-request ACL token. This option
# overrides the Consul Agent's default token. If the token is not set here
{% endif %}
}
-{% endif %}
\ No newline at end of file
+{% endif %}
---
-# file: roles/user_add/defaults/main.yaml
+# file: defaults/main.yaml
# Default shell for a user if none is specified.
users_shell: /bin/bash
---
-# file: roles/user_add/handlers/main.yaml
+# file: handlers/main.yaml
- name: Restart SSHd
ansible.builtin.service:
---
-# file: roles/user_add/tasks/main.yaml
+# file: tasks/main.yaml
-- name: Conf - Add User
+- name: Add User
ansible.builtin.user:
append: "{{ item.append | default(omit) }}"
createhome: "{{ 'yes' if users_create_homedirs else 'no' }}"
tags:
- user-add-conf
-- name: Conf - SSH keys
+- name: SSH keys
ansible.builtin.authorized_key:
user: "{{ item.0.username }}"
key: "{{ item.1 }}"
tags:
- user-add-conf
-- name: Conf - Disable Password Login
+- name: Disable Password Login
ansible.builtin.lineinfile:
dest: "/etc/ssh/sshd_config"
regexp: "^PasswordAuthentication yes"
line: "PasswordAuthentication no"
- notify:
- - "Restart SSHd"
when:
- sshd_disable_password_login
tags:
vault_backend_tls_ca_file: "{{ vault_tls_ca_file }}"
vault_consul: "127.0.0.1:8500"
-vault_consul_path: "vault"
+vault_consul_path: "vault_data"
vault_consul_service: "vault"
vault_consul_scheme: "http"
vault_tls_gossip: "{{ lookup('env','VAULT_TLS_GOSSIP') | default(0, true) }}"
vault_tls_copy_keys: true
-vault_protocol: "{% if vault_tls_disable %}http{% else %}https{% endif %}"
+vault_protocol: "{% if vault_tls_disable %}https{% else %}https{% endif %}"
vault_tls_cert_file: "{{ lookup('env','VAULT_TLS_CERT_FILE') | default('server.crt', true) }}"
vault_tls_key_file: "{{ lookup('env','VAULT_TLS_KEY_FILE') | default('server.key', true) }}"
vault_tls_ca_file: "{{ lookup('env','VAULT_TLS_CA_CRT') | default('ca.crt', true) }}"
tls_ca_file="{{ vault_backend_tls_config_path }}/{{ vault_backend_tls_ca_file }}"
{% endif %}
-}
\ No newline at end of file
+}
provider "vault" {
address = "http://10.30.51.24:8200"
skip_tls_verify = true
- token = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ token = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
\ No newline at end of file
provider "vault" {
address = "http://10.30.51.24:8200"
skip_tls_verify = true
- token = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ token = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
\ No newline at end of file
provider "vault" {
address = "http://10.30.51.24:8200"
skip_tls_verify = true
- token = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ token = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
\ No newline at end of file
provider "vault" {
address = "http://vault.service.consul:8200"
skip_tls_verify = true
- token = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ token = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
\ No newline at end of file
provider "vault" {
address = "http://vault.service.consul:8200"
skip_tls_verify = true
- token = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ token = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
\ No newline at end of file
provider "vault" {
address = "http://vault.service.consul:8200"
skip_tls_verify = true
- token = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ token = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
\ No newline at end of file
provider "vault" {
address = "http://10.30.51.24:8200"
skip_tls_verify = true
- token = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ token = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
\ No newline at end of file
provider "vault" {
address = "http://10.30.51.24:8200"
skip_tls_verify = true
- token = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ token = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
\ No newline at end of file
provider "vault" {
address = "http://10.30.51.24:8200"
skip_tls_verify = true
- token = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ token = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
\ No newline at end of file
provider "vault" {
address = "http://10.30.51.24:8200"
skip_tls_verify = true
- token = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ token = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
\ No newline at end of file
variable "vault_provider_token" {
description = "Vault root token."
type = string
- default = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
+ default = "hvs.bzHw4ZHsz9B0019P8I73yS6l"
}
variable "vault_name" {
# fdio logs iam
source = "../"
name = "dynamic-aws-creds-vault-fdio-logs"
+ aws_access_key = var.aws_access_key
+ aws_secret_key = var.aws_secret_key
}
module "fdio-docs" {
# fdio docs iam
source = "../"
name = "dynamic-aws-creds-vault-fdio-docs"
+ aws_access_key = var.aws_access_key
+ aws_secret_key = var.aws_secret_key
}
module "fdio-csit-jenkins" {
# fdio csit jenkins iam
source = "../"
name = "dynamic-aws-creds-vault-fdio-csit-jenkins"
+ aws_access_key = var.aws_access_key
+ aws_secret_key = var.aws_secret_key
}
variable "vault_provider_address" {
description = "Vault cluster address."
type = string
- default = "http://10.30.51.23:8200"
+ default = "http://10.30.51.26:8200"
}
variable "vault_provider_skip_tls_verify" {
type = string
sensitive = true
}
+
+variable "aws_access_key" {
+ description = "AWS access key"
+ type = string
+ sensitive = true
+}
+
+variable "aws_secret_key" {
+ description = "AWS secret key"
+ type = string
+ sensitive = true
+}
\ No newline at end of file
terraform {
backend "consul" {
- address = "10.30.51.23:8500"
+ address = "10.30.51.26:8500"
scheme = "http"
path = "terraform/aws-secret-backend"
}
required_providers {
vault = {
- version = ">= 3.12.0"
+ version = "4.3.0"
}
}
required_version = ">= 1.5.4"
terraform {
required_providers {
vault = {
- version = ">=2.22.1"
+ version = "4.3.0"
}
}
required_version = ">= 1.1.4"
-FROM ubuntu:22.04 as ubuntu_jammy
+FROM ubuntu:24.04 as ubuntu_noble
LABEL Description="ubuntu intermediate image"
LABEL Version="2.0"
&& apt install -y wget genisoimage syslinux-common \
&& mkdir -p /var/lib/tftpboot/grub \
&& mkdir -p /var/lib/tftpboot/grub/fonts \
- && mkdir -p /var/lib/tftpboot/casper/ubuntu-jammy-amd64/ \
- && mkdir -p /var/lib/tftpboot/casper/ubuntu-jammy-arm64/
+ && mkdir -p /var/lib/tftpboot/casper/ubuntu-noble-amd64/ \
+ && mkdir -p /var/lib/tftpboot/casper/ubuntu-noble-arm64/
-ENV ISO_JAMMY_AMD64 https://old-releases.ubuntu.com/releases/22.04.1/ubuntu-22.04.1-live-server-amd64.iso
-ENV ISO_JAMMY_ARM64 https://old-releases.ubuntu.com/releases/22.04.1/ubuntu-22.04.1-live-server-arm64.iso
-ENV EFI_JAMMY_AMD64 http://archive.ubuntu.com/ubuntu/dists/jammy/main/uefi/grub2-amd64/current/grubnetx64.efi.signed
-ENV EFI_JAMMY_ARM64 http://ports.ubuntu.com/ubuntu-ports/dists/jammy/main/uefi/grub2-arm64/current/grubnetaa64.efi.signed
+ENV ISO_NOBLE_AMD64 https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso
+ENV ISO_NOBLE_ARM64 https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04-live-server-arm64.iso
+ENV EFI_NOBLE_AMD64 http://archive.ubuntu.com/ubuntu/dists/jammy/main/uefi/grub2-amd64/current/grubnetx64.efi.signed
+ENV EFI_NOBLE_ARM64 http://ports.ubuntu.com/ubuntu-ports/dists/jammy/main/uefi/grub2-arm64/current/grubnetaa64.efi.signed
RUN echo "Preparing Grub EFI Binary" \
- && wget $EFI_JAMMY_AMD64 -O /var/lib/tftpboot/grubx64.efi \
- && wget $EFI_JAMMY_ARM64 -O /var/lib/tftpboot/grubaa64.efi \
+ && wget $EFI_NOBLE_AMD64 -O /var/lib/tftpboot/grubx64.efi \
+ && wget $EFI_NOBLE_ARM64 -O /var/lib/tftpboot/grubaa64.efi \
&& apt download shim-signed \
&& dpkg-deb --fsys-tarfile shim-signed*deb | tar x ./usr/lib/shim/shimx64.efi.signed.latest -O > /var/lib/tftpboot/bootx64.efi \
&& apt download grub-common \
&& dpkg-deb --fsys-tarfile grub-common*deb | tar x ./usr/share/grub/unicode.pf2 -O > /var/lib/tftpboot/grub/fonts/unicode.pf2
RUN echo "Preparing Casper Kernel" \
- && wget $ISO_JAMMY_AMD64 -O /ubuntu-22.04.1-live-server-amd64.iso \
- && isoinfo -i /ubuntu-22.04.1-live-server-amd64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-amd64/initrd \
- && isoinfo -i /ubuntu-22.04.1-live-server-amd64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-amd64/vmlinuz \
- && wget $ISO_JAMMY_ARM64 -O /ubuntu-22.04.1-live-server-arm64.iso \
- && isoinfo -i /ubuntu-22.04.1-live-server-arm64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-arm64/initrd \
- && isoinfo -i /ubuntu-22.04.1-live-server-arm64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-arm64/vmlinuz
+ && wget $ISO_NOBLE_AMD64 -O /ubuntu-24.04-live-server-amd64.iso \
+ && isoinfo -i /ubuntu-24.04-live-server-amd64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-noble-amd64/initrd \
+ && isoinfo -i /ubuntu-24.04-live-server-amd64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-noble-amd64/vmlinuz \
+ && wget $ISO_NOBLE_ARM64 -O /ubuntu-24.04-live-server-arm64.iso \
+ && isoinfo -i /ubuntu-24.04-live-server-arm64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-noble-arm64/initrd \
+ && isoinfo -i /ubuntu-24.04-live-server-arm64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-noble-arm64/vmlinuz
FROM alpine
&& rm -rf /var/cache/apk/*
# Extract installer from previous image.
-COPY --from=ubuntu_jammy /var/lib/tftpboot /var/lib/tftpboot
+COPY --from=ubuntu_noble /var/lib/tftpboot /var/lib/tftpboot
# Configure PXE.
COPY tftpboot/ /var/lib/tftpboot/
# Start dnsmasq. It picks up default configuration from /etc/dnsmasq.conf and
# /etc/default/dnsmasq plus any command line switch
-ENTRYPOINT ["sh","-c","dnsmasq","--interface=$E_INT","--listen-address=$E_ADD"]
\ No newline at end of file
+ENTRYPOINT ["sh","-c","dnsmasq","--interface=$E_INT","--listen-address=$E_ADD"]
# Hosts DHCP settings yul1_1 subnet.
dhcp-host=7c:c2:55:55:c0:74,10.30.51.21,s21-nomad,infinite # eno1
dhcp-host=7c:c2:55:55:c0:7a,10.30.51.22,s22-nomad,infinite # eno1
-dhcp-host=ac:1f:6b:5a:6a:d4,10.30.51.23,s23-nomad,infinite # eno1
-dhcp-host=ac:1f:6b:5a:6a:b4,10.30.51.24,s24-nomad,infinite # eno1
-dhcp-host=ac:1f:6b:5a:6b:08,10.30.51.25,s25-nomad,infinite # eno1
-dhcp-host=ac:1f:6b:ac:d9:2e,10.30.51.26,s26-nomad,infinite # eno1
+dhcp-host=ac:1f:6b:5a:6a:d4,10.30.51.23,s23-nomad,infinite # eno1np0
+dhcp-host=ac:1f:6b:5a:6a:b4,10.30.51.24,s24-nomad,infinite # eno1np0
+dhcp-host=ac:1f:6b:5a:6b:08,10.30.51.25,s25-nomad,infinite # eno1np0
+dhcp-host=ac:1f:6b:ac:d9:2e,10.30.51.26,s26-nomad,infinite # eno1np0
dhcp-host=ac:1f:6b:8b:55:d8,10.30.51.27,s27-nomad,infinite # eno1
dhcp-host=ac:1f:6b:8a:8d:0a,10.30.51.28,s28-nomad,infinite # eno1
dhcp-host=7c:c2:55:55:c0:78,10.30.51.30,s30-t15-sut1,infinite # eno1
menuentry "Install s31-t16-sut1" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=:::::eno1:dhcp url=https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/7c:c2:55:55:c0:6c/ ---
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.isoautoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/7c:c2:55:55:c0:6c/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
menuentry "Install s21-nomad" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=:::::eno1:dhcp url=https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/7c:c2:55:55:c0:74/ ---
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/7c:c2:55:55:c0:74/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
menuentry "Install s30-t15-sut1" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=:::::eno1:dhcp url=https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/7c:c2:55:55:c0:78/ ---
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/7c:c2:55:55:c0:78/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
menuentry "Install s22-nomad" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=:::::eno1:dhcp url=https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/7c:c2:55:55:c0:7a/ ---
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/7c:c2:55:55:c0:7a/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
menuentry "Install s24-nomad" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:5a:6a:b4 url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:5a:6a:b4/ --- console=ttyS0,115200n8 quiet
- initrd /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1np0:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.23:8081/ubuntu_noble_amd64/ac:1f:6b:5a:6a:b4/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
+}
menuentry "Install s23-nomad" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:5a:6a:d4 url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:5a:6a:d4/ --- console=ttyS0,115200n8 quiet
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1np0:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/ac:1f:6b:5a:6a:d4/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
menuentry "Install s25-nomad" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:5a:6b:08 url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:5a:6b:08/ --- console=ttyS0,115200n8 quiet
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=::::eno1np0::dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/ac:1f:6b:5a:6b:08/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
menuentry "Install s28-nomad" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8a:8d:0a url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8a:8d:0a/ --- console=ttyS0,115200n8 quiet
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/ac:1f:6b:8a:8d:0a/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
menuentry "Install s27-nomad" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:55:d8 url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:55:d8/ --- console=ttyS0,115200n8 quiet
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/ac:1f:6b:8b:55:d8/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
menuentry "Install s26-nomad" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d9:2e url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d9:2e/ --- console=ttyS0,115200n8 quiet
- initrd /casper/ubuntu-jammy-amd64/initrd
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/ac:1f:6b:ac:d9:2e/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
menuentry "Install s92-nomad" {
- linux /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=d8:5e:d3:02:b1:9f url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/d8:5e:d3:02:b1:9f/ --- console=ttyAMA0,115200n8 quiet
- initrd /casper/ubuntu-jammy-arm64/initrd
+ linux /casper/ubuntu-noble-arm64/vmlinuz ip=::::eno1::dhcp url=https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/d8:5e:d3:02:b1:9f/ ---
+ initrd /casper/ubuntu-noble-arm64/initrd
}
\ No newline at end of file
menuentry "Install s91-nomad" {
- linux /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=d8:5e:d3:02:b1:bb url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/d8:5e:d3:02:b1:bb/ --- console=ttyAMA0,115200n8 quiet
- initrd /casper/ubuntu-jammy-arm64/initrd
-}
\ No newline at end of file
+ linux /casper/ubuntu-noble-arm64/vmlinuz ip=::::eno1::dhcp url=https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/d8:5e:d3:02:b1:bb/ ---
+ initrd /casper/ubuntu-noble-arm64/initrd
+}
-FROM ubuntu:22.04 as ubuntu_jammy
+FROM ubuntu:24.04 as ubuntu_noble
LABEL Description="ubuntu intermediate image"
LABEL Version="2.0"
RUN apt update \
&& apt install -y wget
-ENV ISO_JAMMY_AMD64 https://old-releases.ubuntu.com/releases/22.04.1/ubuntu-22.04.1-live-server-arm64.iso
-ENV ISO_JAMMY_ARM64 https://old-releases.ubuntu.com/releases/22.04.1/ubuntu-22.04.1-live-server-arm64.iso
+ENV ISO_NOBLE_AMD64 https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso
+ENV ISO_NOBLE_ARM64 https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04-live-server-arm64.iso
RUN echo "Preparing ISO Pre-cache" \
- && wget $ISO_JAMMY_AMD64 -O /ubuntu-22.04.1-live-server-amd64.iso \
- && wget $ISO_JAMMY_ARM64 -O /ubuntu-22.04.1-live-server-arm64.iso
+ && wget $ISO_NOBLE_AMD64 -O /ubuntu-24.04-live-server-amd64.iso \
+ && wget $ISO_NOBLE_ARM64 -O /ubuntu-24.04-live-server-arm64.iso
FROM nginx:stable-alpine
LABEL Description="nginx service image"
LABEL Version="2.0"
-ENV NGINX_JAMMY_AMD64 /usr/share/nginx/html/ubuntu_jammy_amd64/
-ENV NGINX_JAMMY_ARM64 /usr/share/nginx/html/ubuntu_jammy_arm64/
+ENV NGINX_NOBLE_AMD64 /usr/share/nginx/html/ubuntu_noble_amd64/
+ENV NGINX_NOBLE_ARM64 /usr/share/nginx/html/ubuntu_noble_arm64/
-RUN mkdir -p $NGINX_JAMMY_AMD64 \
- && mkdir -p $NGINX_JAMMY_ARM64
+RUN mkdir -p $NGINX_NOBLE_AMD64 \
+ && mkdir -p $NGINX_NOBLE_ARM64
-COPY --from=ubuntu_jammy /ubuntu-22.04.1-live-server-amd64.iso $NGINX_JAMMY_AMD64/ubuntu-22.04.1-live-server-amd64.iso
-COPY --from=ubuntu_jammy /ubuntu-22.04.1-live-server-arm64.iso $NGINX_JAMMY_ARM64/ubuntu-22.04.1-live-server-arm64.iso
+COPY --from=ubuntu_noble /ubuntu-24.04-live-server-amd64.iso $NGINX_NOBLE_AMD64/ubuntu-24.04-live-server-amd64.iso
+COPY --from=ubuntu_noble /ubuntu-24.04-live-server-arm64.iso $NGINX_NOBLE_ARM64/ubuntu-24.04-live-server-arm64.iso
-COPY html/ /usr/share/nginx/html/
\ No newline at end of file
+COPY html/ /usr/share/nginx/html/
locale: en_US.UTF-8
network:
ethernets:
- eno1:
+ eno1np0:
addresses: [ 10.30.51.24/24 ]
dhcp4: false
gateway4: 10.30.51.1
- device: format-0
id: mount-0
path: /boot/efi
- type: mount
\ No newline at end of file
+ type: mount
locale: en_US.UTF-8
network:
ethernets:
- eno1:
+ eno1np0:
addresses: [ 10.30.51.23/24 ]
dhcp4: false
gateway4: 10.30.51.1
- device: format-0
id: mount-0
path: /boot/efi
- type: mount
\ No newline at end of file
+ type: mount
locale: en_US.UTF-8
network:
ethernets:
- eno1:
+ eno1np0:
addresses: [ 10.30.51.25/24 ]
dhcp4: false
gateway4: 10.30.51.1
- device: format-0
id: mount-0
path: /boot/efi
- type: mount
\ No newline at end of file
+ type: mount
- device: format-0
id: mount-0
path: /boot/efi
- type: mount
\ No newline at end of file
+ type: mount
Code Review / csit.git / commitdiff