From 8897346be53170aaac7d84bec4facd845bf09519 Mon Sep 17 00:00:00 2001 From: "Sridhar K. N. Rao" Date: Sun, 15 Dec 2019 14:23:30 +0530 Subject: Addition of Intel Pod15 Site Manifest This patch adds site manifest for Intel Pod15 Update the vlan-IDs and interface-names The NIC ens785f0 and ens785f1 have swapped roles. Accordingly, the configuration is changed Signed-off-by: Sridhar K. N. Rao Change-Id: I20960e505361bc00d019ea3800814637b9ef4953 --- .../intel-pod15/profiles/hardware/intel-pod15.yaml | 94 +++++++++++++++++ site/intel-pod15/profiles/host/cp-intel-pod15.yaml | 105 +++++++++++++++++++ site/intel-pod15/profiles/host/dp-intel-pod15.yaml | 112 +++++++++++++++++++++ site/intel-pod15/profiles/region.yaml | 60 +++++++++++ 4 files changed, 371 insertions(+) create mode 100644 site/intel-pod15/profiles/hardware/intel-pod15.yaml create mode 100644 site/intel-pod15/profiles/host/cp-intel-pod15.yaml create mode 100644 site/intel-pod15/profiles/host/dp-intel-pod15.yaml create mode 100644 site/intel-pod15/profiles/region.yaml (limited to 'site/intel-pod15/profiles') diff --git a/site/intel-pod15/profiles/hardware/intel-pod15.yaml b/site/intel-pod15/profiles/hardware/intel-pod15.yaml new file mode 100644 index 0000000..207ee94 --- /dev/null +++ b/site/intel-pod15/profiles/hardware/intel-pod15.yaml @@ -0,0 +1,94 @@ +--- +schema: 'drydock/HardwareProfile/v1' +metadata: + schema: 'metadata/Document/v1' + name: intel-pod15 + layeringDefinition: + abstract: false + layer: site + storagePolicy: cleartext +data: + # Vendor of the server chassis + vendor: Intel + # Generation of the chassis model + generation: '4' + # Version of the chassis model within its generation - not version of the hardware definition + hw_version: '3' + # The certified version of the chassis BIOS + bios_version: 'SE5C610.86B.01.01.0019.101220160604' + # Mode of the default boot of hardware - bios, uefi + boot_mode: bios + # Protocol of boot of the hardware - pxe, usb, hdd + bootstrap_protocol: pxe + # Which interface to use for network booting within the OOB manager, not OS device + pxe_interface: 0 + + # Map hardware addresses to aliases/roles to allow a mix of hardware configs + # in a site to result in a consistent configuration + + device_aliases: + ## network + # $ sudo lspci |grep -i ethernet + # 02:00.0 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01) + # 02:00.1 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01) + # 04:00.0 Ethernet controller: Intel Corporation I350 Gigabit Network Connection (rev 01) + # 04:00.3 Ethernet controller: Intel Corporation I350 Gigabit Network Connection (rev 01) + # control networks + # eno1 + ctrl_nic1: + address: '0000:03:00.0' + dev_type: 'I350 Gigabit Network Connection' + bus_type: 'pci' + # eno2 + ctrl_nic2: + address: '0000:03:00.3' + dev_type: 'I350 Gigabit Network Connection' + bus_type: 'pci' + + # data networks + # ens785f1 + data_nic1: + address: '0000:05:00.1' + dev_type: '82599ES 10-Gigabit SFI/SFP+ Network Connection' + bus_type: 'pci' + # ens785f0 + data_nic2: + address: '0000:05:00.0' + dev_type: '82599ES 10-Gigabit SFI/SFP+ Network Connection' + bus_type: 'pci' + + ## storage + # $ sudo lshw -c disk + # *-disk + # description: ATA Disk + # product: INTEL SSDSC2BB58 + # physical id: 0.0.0 + # bus info: scsi@0:0.0.0 + # logical name: /dev/sda + # version: 0101 + # size: 447GiB (480GB) + # *-disk + # description: ATA Disk + # product: TOSHIBA MG03ACA1 + # physical id: 0.0.0 + # bus info: scsi@1:0.0.0 + # logical name: /dev/sdb + # version: FL2H + # size: 931GiB (1TB) + # /dev/sda + bootdisk: + address: '0:0.0.0' + dev_type: 'SSDSC2BB48' + bus_type: 'scsi' + # /dev/sdb + datadisk: + address: '1:0.0.0' + dev_type: 'MG03ACA1' + bus_type: 'scsi' + cpu_sets: + kvm: '4-43,48-87' + hugepages: + dpdk: + size: '1G' + count: 32 +... diff --git a/site/intel-pod15/profiles/host/cp-intel-pod15.yaml b/site/intel-pod15/profiles/host/cp-intel-pod15.yaml new file mode 100644 index 0000000..5708f12 --- /dev/null +++ b/site/intel-pod15/profiles/host/cp-intel-pod15.yaml @@ -0,0 +1,105 @@ +--- +# The primary control plane host profile for Airship for DELL R720s, and +# should not need to be altered if you are using matching HW. The active +# participants in the Ceph cluster run on this profile. Other control plane +# services are not affected by primary vs secondary designation. +schema: drydock/HostProfile/v1 +metadata: + schema: metadata/Document/v1 + name: cp-intel-pod15 + storagePolicy: cleartext + layeringDefinition: + abstract: false + layer: site + parentSelector: + hosttype: cp-global + actions: + - method: replace + path: .interfaces + - method: replace + path: .storage + - method: merge + path: . +data: + hardware_profile: intel-pod15 + + primary_network: dmz + interfaces: + dmz: + device_link: dmz + slaves: + - ctrl_nic1 + networks: + - dmz + admin: + device_link: admin + slaves: + - ctrl_nic2 + networks: + - admin + data1: + device_link: data1 + slaves: + - data_nic1 + networks: + - private + - management + data2: + device_link: data2 + slaves: + - data_nic2 + networks: + - storage + - public + + storage: + physical_devices: + bootdisk: + labels: + bootdrive: 'true' + partitions: + - name: 'root' + size: '30g' + bootable: true + filesystem: + mountpoint: '/' + fstype: 'ext4' + mount_options: 'defaults' + - name: 'boot' + size: '1g' + filesystem: + mountpoint: '/boot' + fstype: 'ext4' + mount_options: 'defaults' + - name: 'var_log' + size: '100g' + filesystem: + mountpoint: '/var/log' + fstype: 'ext4' + mount_options: 'defaults' + - name: 'var' + size: '>100g' + filesystem: + mountpoint: '/var' + fstype: 'ext4' + mount_options: 'defaults' + + datadisk: + partitions: + - name: 'ceph' + size: '99%' + filesystem: + mountpoint: '/var/lib/ceph' + fstype: 'ext4' + mount_options: 'defaults' + + platform: + image: 'xenial' + kernel: 'hwe-16.04' + kernel_params: + kernel_package: 'linux-image-4.15.0-46-generic' + + metadata: + owner_data: + openstack-l3-agent: enabled +... diff --git a/site/intel-pod15/profiles/host/dp-intel-pod15.yaml b/site/intel-pod15/profiles/host/dp-intel-pod15.yaml new file mode 100644 index 0000000..25e8b52 --- /dev/null +++ b/site/intel-pod15/profiles/host/dp-intel-pod15.yaml @@ -0,0 +1,112 @@ +--- +# The data plane host profile for Airship for DELL R720s, and should +# not need to be altered if you are using matching HW. The host profile is setup +# for cpu isolation (for nova pinning), hugepages, and sr-iov. +schema: drydock/HostProfile/v1 +metadata: + schema: metadata/Document/v1 + name: dp-intel-pod15 + storagePolicy: cleartext + layeringDefinition: + abstract: false + layer: type + parentSelector: + hosttype: dp-global + actions: + - method: replace + path: .interfaces + - method: replace + path: .storage + - method: merge + path: . +data: + hardware_profile: intel-pod15 + + primary_network: dmz + interfaces: + dmz: + device_link: dmz + slaves: + - ctrl_nic1 + networks: + - dmz + admin: + device_link: admin + slaves: + - ctrl_nic2 + networks: + - admin + data1: + device_link: data1 + slaves: + - data_nic1 + networks: + - private + - management + data2: + device_link: data2 + slaves: + - data_nic2 + networks: + - storage + - public + + storage: + physical_devices: + bootdisk: + labels: + bootdrive: 'true' + partitions: + - name: 'root' + size: '30g' + bootable: true + filesystem: + mountpoint: '/' + fstype: 'ext4' + mount_options: 'defaults' + - name: 'boot' + size: '1g' + filesystem: + mountpoint: '/boot' + fstype: 'ext4' + mount_options: 'defaults' + - name: 'log' + size: '100g' + filesystem: + mountpoint: '/var/log' + fstype: 'ext4' + mount_options: 'defaults' + - name: 'var' + size: '>100g' + filesystem: + mountpoint: '/var' + fstype: 'ext4' + mount_options: 'defaults' + + datadisk: + partitions: + - name: 'ceph' + size: '99%' + filesystem: + mountpoint: '/var/lib/ceph' + fstype: 'ext4' + mount_options: 'defaults' + + platform: + image: 'xenial' + kernel: 'hwe-16.04' + kernel_params: + kernel_package: 'linux-image-4.15.0-46-generic' + intel_iommu: 'on' + iommu: 'pt' + amd_iommu: 'on' + cgroup_disable: 'hugetlb' + transparent_hugepage: 'never' + hugepagesz: 'hardwareprofile:hugepages.dpdk.size' + hugepages: 'hardwareprofile:hugepages.dpdk.count' + default_hugepagesz: 'hardwareprofile:hugepages.dpdk.size' + isolcpus: 'hardwareprofile:cpuset.kvm' + metadata: + owner_data: + sriov: enabled +... diff --git a/site/intel-pod15/profiles/region.yaml b/site/intel-pod15/profiles/region.yaml new file mode 100644 index 0000000..fd8d987 --- /dev/null +++ b/site/intel-pod15/profiles/region.yaml @@ -0,0 +1,60 @@ +--- +# The purpose of this file is to define the drydock Region, which in turn drives +# the MaaS region. +schema: 'drydock/Region/v1' +metadata: + schema: 'metadata/Document/v1' + # NEWSITE-CHANGEME: Replace with the site name + name: intel-pod15 + layeringDefinition: + abstract: false + layer: site + storagePolicy: cleartext + substitutions: + - dest: + path: .repositories.main_archive + src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .packages.repositories.main_archive + # NEWSITE-CHANGEME: Substitutions from deckhand SSH public keys into the + # list of authorized keys which MaaS will register for the build-in "ubuntu" + # account during the PXE process. Create a substitution rule for each SSH + # key that should have access to the "ubuntu" account (useful for trouble- + # shooting problems before UAM or UAM-lite is operational). SSH keys are + # stored as secrets in site/seaworthy/secrets. + - dest: + # Add/replace the item in the list + path: .authorized_keys[0] + src: + schema: deckhand/PublicKey/v1 + # This should match the "name" metadata of the SSH key which will be + # substituted, located in site/intel-pod15/secrets folder. + name: sridhar_ssh_public_key + path: . + - dest: + # Increment the list index + path: .authorized_keys[1] + src: + schema: deckhand/PublicKey/v1 + # your ssh key + name: mfix_ssh_public_key + path: . + - dest: + # Increment the list index + path: .authorized_keys[2] + src: + schema: deckhand/PublicKey/v1 + # your ssh key + name: cedric_ssh_public_key + path: . +data: + tag_definitions: [] + # This is the list of SSH keys which MaaS will register for the built-in + # "ubuntu" account during the PXE process. This list is populated by + # substitution, so the same SSH keys do not need to be repeated in multiple + # manifests. + authorized_keys: [] + repositories: + remove_unlisted: true +... -- cgit 1.2.3-korg