aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-05-25 12:17:37 +0000
committerpmikus <pmikus@cisco.com>2021-05-25 12:17:37 +0000
commit46e030569e675938d5459c12a982678bcf0eec3b (patch)
tree63a2de2ac28bf7fe1c7029d98cf736f4f985ec29
parentbff5fac6c531aa5ed24bb45362d3abff5179e0e3 (diff)
Infra: Add fdio-marvel-dev
Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: Ic851dea3b763006b57e1b9c017274d3279b6a1ba
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml11
-rw-r--r--fdio.infra.ansible/roles/docker/tasks/main.yaml4
-rwxr-xr-xfdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf2
-rw-r--r--fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-40:8d:5c:e7:b2:6e4
-rw-r--r--fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/40:8d:5c:e7:b2:6e/meta-data0
-rw-r--r--fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/40:8d:5c:e7:b2:6e/user-data83
6 files changed, 94 insertions, 10 deletions
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml
index 77fee7377b..239abb64f2 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml
@@ -12,13 +12,6 @@ users:
password: "$6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1"
ssh_key:
- "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com"
+ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCG7Shfr7ASXXwpazYDGFzChGl7i4HgY9n81GTwc17B/O19IiJdrxFcBQH19HMuTFtWU4d9bQ6xgzz2pojBN13L3pEsStCHovDlEYbvfRxI2l2hcAAop1j1E4izHAS9IvCoy1AgWqBg6tsfP5mzOwGbSbcdI9ADRKIHgDTVbHg9SqKed27bNOLU0u3/5ra2Oar/tVIW37geEqFV/nHIBZ03Y/mszvXP/t/hP5bgJIGJKkzTjLd1aqEcuGmubW+wTQnVnrhFB87dw91gPj6BVyV0+7Vt1wrvPKqP2sGJhojAMSrBQBySnlrYgEg00bwDgNGFevatfG9+nTId+nhoKBkXya3MjSp4HwrGqGcij3/h7ovlau3/iRhkqlSeqenaNm4zKTAXRTnb60j2WKa6im0zdqJX98anp4mhjE8xHhmmfZV3vRT8mtY4hF/lg79miXFHpWH97bZV6r/D9qj1HWI/laJfOC5MOJdRcLETwtsUNMHeHtVnY3yu0XFYNcl2Xwajtnz3waF7vn1QHvAM9p878+JrO/IEUqEc0yZWVvlhZ7Krx1pS+APoMy8097MYDGFzFTkYSstKLGbgm/S7dEiWuSVxmMUxW7JYO3gHrQ3f1EvAYh2UFdWy76Dzr5II9UpVwOwF+HL/Oy8Sk77bPaK+tn7Kh4Tx7WWE0+EOAgElQ== ayourtch@ayourtch-lnx"
- "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes"
- - username: testuser
- groups: [adm, sudo]
- password: "$6$zpBUdQ4q$P2zKclumvCndWujgP/qQ8eMk3YZk7ESAom04Fqp26hJH2jWkMXEX..jqxzMdDLJKiDaDHIaSkQMVjHzd3cRLs1"
- ssh_key:
- - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com"
- - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes"
- - username: vppdev
- groups: [adm, sudo]
- password: "$6$C5R6nFQlJ9Vu$l.Q6BDOMSgUFQv5OQw4viZVz8LCHziubXAwThaJXo/xVaAkqTGupPTvdMlK5r4ArDvDMPgD0AeO8/L.ciPl.g."
+ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0GXoSGDZ95TE/TT3kf4ZS3Tiso0UO3MVhqAqZ/F6LOvLyqnMPfhxPz1XpHsDikxvKgwhZvdBm1dWbKkPsD7jtw0PGphQO8QuEwBd2ZMvxZ4Qg6lNDUl5x3zRO2nkbKpcqnOugGLTtXP+yfw/wfQ2HNFLDP9gE90xegsPT83PmRUntQlhbS3ByHcCSUScC+Y1heZXuoKNyrmUY46lxkKsNfhx8sQKo0YhB21atV/mcAQbAaO2LggmaQYGtWizqPNGWIRsi9W8ZYnKva67c3Pbv/TTfaqmrNCwOXJ8G9oL+/3MlKbl3b5mYlTs2a/e9yVgMNwUZVX7aiHpgPgaVjL6j swdev@BradyBunch-MacMini.local"
diff --git a/fdio.infra.ansible/roles/docker/tasks/main.yaml b/fdio.infra.ansible/roles/docker/tasks/main.yaml
index 5a96b7a7c5..773cbf7a5b 100644
--- a/fdio.infra.ansible/roles/docker/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/docker/tasks/main.yaml
@@ -36,6 +36,8 @@
owner: "root"
group: "root"
mode: "0644"
+ notify:
+ - "Restart Docker"
when: >
docker_daemon is defined
tags:
@@ -80,3 +82,5 @@
when: docker_users
tags:
- docker-conf-user
+
+- meta: flush_handlers
diff --git a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
index deadc600f5..d6b03b0ef1 100755
--- a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
+++ b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
@@ -55,7 +55,7 @@ dhcp-host=38:0e:4d:9c:85:7a,10.30.51.34,s44-nomad,infinite # enp1s0f0
dhcp-host=38:0e:4d:9c:4b:0c,10.30.51.35,s45-nomad,infinite # enp1s0f0
dhcp-host=a0:a3:3b:c1:14:28,10.30.51.36,s17-t33-sut1,infinite # enahisic2i0
dhcp-host=a0:a3:3b:c1:12:fa,10.30.51.37,s18-t33-sut2,infinite # enahisic2i0
-dhcp-host=40:8d:5c:e7:b2:6e,10.30.51.38,fdio-marvell-dev,infinite # enP2p1s0f1
+dhcp-host=40:8d:5c:e7:b2:6e,10.30.51.38,fdio-marvell-dev,infinite # enP2p1s0v0
dhcp-host=40:8d:5c:e7:b3:19,10.30.51.39,s53-nomad,infinite # enP2p1s0v0
dhcp-host=40:8d:5c:e0:9f:cd,10.30.51.40,s54-nomad,infinite # enP2p1s0v0
dhcp-host=ac:1f:6b:8a:8d:b6,10.30.51.44,s3-t21-sut1,infinite # eno1
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-40:8d:5c:e7:b2:6e b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-40:8d:5c:e7:b2:6e
new file mode 100644
index 0000000000..acf612ada8
--- /dev/null
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-40:8d:5c:e7:b2:6e
@@ -0,0 +1,4 @@
+menuentry "Install fdio-marvell-dev" {
+ linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=40:8d:5c:e7:b2:6e url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.2-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/40:8d:5c:e7:b2:6e/ --- console=ttyAMA0,115200n8 quiet
+ initrd /casper/ubuntu-focal-arm64/initrd
+} \ No newline at end of file
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/40:8d:5c:e7:b2:6e/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/40:8d:5c:e7:b2:6e/meta-data
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/40:8d:5c:e7:b2:6e/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/40:8d:5c:e7:b2:6e/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/40:8d:5c:e7:b2:6e/user-data
new file mode 100644
index 0000000000..90594af8cf
--- /dev/null
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/40:8d:5c:e7:b2:6e/user-data
@@ -0,0 +1,83 @@
+#cloud-config
+autoinstall:
+ version: 1
+ apt:
+ geoip: true
+ preserve_sources_list: false
+ primary:
+ - arches: [amd64, i386]
+ uri: http://ca.archive.ubuntu.com/ubuntu
+ - arches: [default]
+ uri: http://ports.ubuntu.com/ubuntu-ports
+ identity:
+ hostname: fdio-marvell-dev
+ password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1
+ realname: localadmin
+ username: localadmin
+ keyboard:
+ layout: us
+ toggle: null
+ variant: ''
+ locale: en_US.UTF-8
+ network:
+ ethernets:
+ enP2p1s0v0:
+ addresses: [ 10.30.51.38/24 ]
+ dhcp4: false
+ gateway4: 10.30.51.1
+ nameservers:
+ addresses: [ 1.1.1.1, 8.8.8.8 ]
+ version: 2
+ packages:
+ - python3
+ refresh-installer:
+ update: no
+ ssh:
+ allow-pw: true
+ authorized-keys: []
+ install-server: true
+ storage:
+ config:
+ - grub_device: false
+ id: disk-sda
+ path: /dev/sda
+ ptable: gpt
+ preserve: false
+ type: disk
+ wipe: superblock-recursive
+ - device: disk-sda
+ grub_device: true
+ id: partition-0
+ flag: boot
+ number: 1
+ preserve: false
+ size: 536870912
+ type: partition
+ wipe: superblock
+ - id: format-0
+ fstype: fat32
+ preserve: false
+ type: format
+ volume: partition-0
+ - device: disk-sda
+ flag: ''
+ grub_device: false
+ id: partition-1
+ number: 2
+ preserve: false
+ size: -1
+ type: partition
+ wipe: superblock
+ - fstype: ext4
+ id: format-1
+ preserve: false
+ type: format
+ volume: partition-1
+ - device: format-1
+ id: mount-1
+ path: /
+ type: mount
+ - device: format-0
+ id: mount-0
+ path: /boot/efi
+ type: mount