From 33531d45822980cb9a0714a7e501c2c329ed80a4 Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 8 Sep 2023 11:37:58 +0000 Subject: feat(infra): SPR backend Signed-off-by: pmikus Change-Id: If48902729a8c13b83c97170c12fc43bac624212c --- .../inventories/lf_inventory/host_vars/10.30.51.30.yaml | 2 +- .../inventories/lf_inventory/host_vars/10.30.51.31.yaml | 2 +- fdio.infra.ansible/roles/consul/tasks/main.yaml | 2 ++ fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh | 4 ++-- fdio.infra.ansible/vpp_device.yaml | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) (limited to 'fdio.infra.ansible') diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml index 8c2e764f11..a02d6234d8 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml @@ -63,7 +63,7 @@ nomad_servers: # Consul settigs. nomad_use_consul: true 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 }}" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.31.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.31.yaml index 51d7236d81..606bb47755 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.31.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.31.yaml @@ -63,7 +63,7 @@ nomad_servers: # Consul settigs. nomad_use_consul: true 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 }}" diff --git a/fdio.infra.ansible/roles/consul/tasks/main.yaml b/fdio.infra.ansible/roles/consul/tasks/main.yaml index 69678f9739..6dd430754b 100644 --- a/fdio.infra.ansible/roles/consul/tasks/main.yaml +++ b/fdio.infra.ansible/roles/consul/tasks/main.yaml @@ -80,6 +80,8 @@ group: "{{ consul_group }}" mode: 0755 with_items: + - "{{ consul_config_dir }}" + - "{{ consul_ssl_dir }}" - "{{ consul_data_dir }}" - "{{ nomad_config_dir }}" - "{{ nomad_ssl_dir }}" diff --git a/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh index 25a9f5d9d9..7be48380e7 100644 --- a/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh +++ b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh @@ -22,5 +22,5 @@ PCI_WHITELIST+=($(lspci -Dmmd ':1592:0200' | cut -f1 -d' ')) declare -A PF_INDICES # Intel NICs -PF_INDICES["0000:86:00.0"]=0 -PF_INDICES["0000:af:00.0"]=0 +PF_INDICES["0000:2a:00.0"]=0 +PF_INDICES["0000:3d:00.0"]=0 diff --git a/fdio.infra.ansible/vpp_device.yaml b/fdio.infra.ansible/vpp_device.yaml index dfd0434336..21676811c7 100644 --- a/fdio.infra.ansible/vpp_device.yaml +++ b/fdio.infra.ansible/vpp_device.yaml @@ -18,8 +18,8 @@ tags: baremetal - role: common tags: common - - role: kernel - tags: kernel +# - role: kernel +# tags: kernel - role: intel tags: intel - role: docker -- cgit 1.2.3-korg