Merge branch 'arcus/zed-staging' into arcus/zed-production

etc/kayobe/ansible/compute-lvm.yml

@@ -21,6 +21,9 @@
     # Iris Gaia Core Icelake
     #root_disk: "pci-0000:00:17.0-ata-2"
     #root_partition_number: "3"
+    # Iris Gaia Core SRapids
+    #root_disk: "pci-0000:49:00.0-nvme-1"
+    #root_partition_number: "3"
     # L40 GPU hypervisor
     #root_disk: "pci-0000:05:00.0-ata-1"
     #root_partition_number: "3"

etc/kayobe/ansible/reboot.yml

@@ -3,8 +3,8 @@
   gather_facts: no
   vars:
      ansible_python_interpreter: "/bin/python3"
-     ansilbe_user: cloud-user
-  hosts: compute-iris-cclake-himem-20220816:compute-iris-cclake-20220113
+     ansible_user: cloud-user
+  hosts: compute-iris-c6620-srapids-20241128
   #  serial: "{{ lookup('env', 'ANSIBLE_SERIAL') | default(1, true) }}"
   tags:
      - reboot

etc/kayobe/environments/production/inventory/hosts

@@ -30,8 +30,8 @@ baremetal-2020-01-02
 baremetal-2020-01-24
 
 [baremetal-2020-01-02]
-#cl-ar06-u42
-#cl-ar06-u41
+cl-ar06-u42
+cl-ar06-u41
 cl-ar06-u40
 cl-ar06-u39
 cl-ar06-u38
@@ -40,7 +40,7 @@ cl-ar06-u36
 cl-ar06-u35
 cl-ar06-u34
 cl-ar06-u33
-#cl-ar06-u32
+cl-ar06-u32
 cl-ar06-u31
 cl-ar06-u30
 

etc/kayobe/environments/production/inventory/overcloud

@@ -203,7 +203,7 @@ svn1-ar04-u2
 compute-20200110
 # REMOVED 20240821 compute-20200305
 compute-20200313
-compute-20200326
+#compute-20200326
 compute-20201119
 compute-20201209-internal-hypers
 # REMOVED 20240821 compute-20201214-cr03-casu-hypers
@@ -228,11 +228,12 @@ compute-tuned-srcp-cclake-20230707
 compute-tuned-srcp-cclake-sriov-20240805
 compute-srcp-cclake-20230707
 compute-rcc-cclake-20230718
-a100_gpu_xe8545
+a100_gpu_xe8545_ska
 a100_gpu_xe8545_iris
 a100_gpu_xe8545_srcp
 dac_e_r740xd
 compute-iris-icelake-20230620
+compute-iris-c6620-srapids-20241128
 ar06_srcp_hosts
 compute-rcp-l40-20231102
 #compute-rcp-r760-mayfly-dev-20240119
@@ -241,7 +242,7 @@ compute-rcp-internal-cclake-20240314
 #compute-ar05-c6420
 compute-ska-src-r660-himem-20240610
 compute-ska-src-c6620-20240814
-compute-rcp-pvc-gpu-20240723
+#compute-rcp-pvc-gpu-20240723
 
 #[compute-ar17-c6320]
 #svn1-ar17-u20
@@ -289,6 +290,7 @@ compute-iris-icelake-20230620
 [compute_saphrapids:children]
 compute-ska-src-r660-himem-20240610
 compute-ska-src-c6620-20240814
+compute-iris-c6620-srapids-20241128
 
 [compute-20200110]
 cl-ar06-u28 ipmi_address=10.45.160.15 bmc_type=idrac
@@ -308,8 +310,9 @@ cl-ar06-u28 ipmi_address=10.45.160.15 bmc_type=idrac
 [compute-20200313]
 cl-ar06-u29 ipmi_address=10.45.160.14 bmc_type=idrac
 
-[compute-20200326]
-cl-ar06-u30 ipmi_address=10.45.160.13 bmc_type=idrac
+#[compute-20200326]
+# OoD host will need a downtime
+#cl-ar06-u30 ipmi_address=10.45.160.13 bmc_type=idrac
 
 [compute-20201119]
 cl-ar06-u42 ipmi_address=10.45.160.1 bmc_type=idrac
@@ -388,7 +391,7 @@ cl-ar06-u5
 [compute-iris-cclake-20210814]
 nova-svn3-er19-u30 # Unused
 nova-svn2-er19-u29 # Unused
-# FAULT nova-svn1-er19-u30 # Unused
+# FAULT-4345 nova-svn1-er19-u30 # Unused
 nova-svn1-er19-u12
 nova-svn4-er19-u23
 nova-svn3-er19-u24
@@ -506,7 +509,7 @@ nova-svn2-er18-u5 ansible_host=10.41.163.138
 nova-svn3-er18-u6 ansible_host=10.41.163.139
 nova-svn4-er18-u5 ansible_host=10.41.163.140
 
-[a100_gpu_xe8545]
+[a100_gpu_xe8545_ska]
 nova-gpu-er20-u39
 
 [a100_gpu_xe8545_iris]
@@ -585,7 +588,7 @@ nova-svn4-fr13-u33 ansible_host=10.41.168.9
 nova-svn4-fr14-u15 ansible_host=10.41.168.64
 nova-svn3-fr14-u16 ansible_host=10.41.168.65
 nova-svn2-fr14-u15 ansible_host=10.41.168.66
-nova-svn1-fr14-u16 ansible_host=10.41.168.67
+# FAULT-4494 nova-svn1-fr14-u16 ansible_host=10.41.168.67
 nova-svn4-fr14-u13 ansible_host=10.41.168.68
 nova-svn3-fr14-u14 ansible_host=10.41.168.69
 nova-svn2-fr14-u13 ansible_host=10.41.168.70
@@ -607,6 +610,40 @@ nova-svn3-fr14-u6 ansible_host=10.41.168.85
 nova-svn2-fr14-u5 ansible_host=10.41.168.86
 nova-svn1-fr14-u6 ansible_host=10.41.168.87
 
+[compute-iris-c6620-srapids-20241128]
+nova-svn4-fr14-u37 ansible_host=10.41.168.92
+nova-svn3-fr14-u38 ansible_host=10.41.168.93
+nova-svn2-fr14-u37 ansible_host=10.41.168.94
+nova-svn1-fr14-u38 ansible_host=10.41.168.95
+nova-svn4-fr14-u35 ansible_host=10.41.168.96
+nova-svn3-fr14-u36 ansible_host=10.41.168.97
+nova-svn2-fr14-u35 ansible_host=10.41.168.98
+nova-svn1-fr14-u36 ansible_host=10.41.168.99
+nova-svn4-fr14-u33 ansible_host=10.41.168.100
+nova-svn3-fr14-u34 ansible_host=10.41.168.101
+nova-svn2-fr14-u33 ansible_host=10.41.168.102
+nova-svn1-fr14-u34 ansible_host=10.41.168.103
+nova-svn4-fr14-u31 ansible_host=10.41.168.104
+nova-svn3-fr14-u32 ansible_host=10.41.168.105
+nova-svn2-fr14-u31 ansible_host=10.41.168.106
+nova-svn1-fr14-u32 ansible_host=10.41.168.107
+nova-svn4-fr14-u29 ansible_host=10.41.168.108
+nova-svn3-fr14-u30 ansible_host=10.41.168.109
+nova-svn2-fr14-u29 ansible_host=10.41.168.110
+nova-svn1-fr14-u30 ansible_host=10.41.168.111
+nova-svn4-fr14-u27 ansible_host=10.41.168.112
+nova-svn3-fr14-u28 ansible_host=10.41.168.113
+nova-svn2-fr14-u27 ansible_host=10.41.168.114
+nova-svn1-fr14-u28 ansible_host=10.41.168.115
+nova-svn4-fr14-u25 ansible_host=10.41.168.116
+nova-svn3-fr14-u26 ansible_host=10.41.168.117
+nova-svn2-fr14-u25 ansible_host=10.41.168.118
+nova-svn1-fr14-u26 ansible_host=10.41.168.119
+nova-svn4-fr14-u17 ansible_host=10.41.168.120
+nova-svn3-fr14-u18 ansible_host=10.41.168.121
+nova-svn2-fr14-u17 ansible_host=10.41.168.122
+nova-svn1-fr14-u18 ansible_host=10.41.168.123
+
 [compute-lrs-srcp-cclake-20230707]
 nova-svn1-ar02-u22 ansible_host=10.41.161.29
 
@@ -710,8 +747,9 @@ nova-svn3-fr14-u40 ansible_host=10.41.168.125
 nova-svn2-fr14-u39 ansible_host=10.41.168.126
 nova-svn1-fr14-u40 ansible_host=10.41.168.127
 
-[compute-rcp-pvc-gpu-20240723]
-nova-sv-ar19-u35 ansible_host=10.41.85.67
+# Removed for PVC screening
+#[compute-rcp-pvc-gpu-20240723]
+#nova-sv-ar19-u35 ansible_host=10.41.85.67
 
 # Switch groups
 [switches:children]

etc/kayobe/environments/production/kolla/config/haproxy/services.d/prometheus-openstack-exporter.cfg

+frontend prometheus_openstack_exporter_front
+    mode http
+    http-request del-header X-Forwarded-Proto
+    option httplog
+    option forwardfor
+    http-request set-header X-Forwarded-Proto https if { ssl_fc }
+    bind 10.5.0.1:9198
+    default_backend prometheus_openstack_exporter_back
+
+backend prometheus_openstack_exporter_back
+    mode http
+    timeout server 10m
+    server clc-mon-ar06-u27 10.5.1.3:9198 check inter 2000 rise 2 fall 5

etc/kayobe/environments/production/kolla/config/keystone/iris_identity-mappings.json

@@ -29,5 +29,36 @@
                 ]
             }
         ]
+    },
+    {
+        "local": [
+            {
+                "user": {
+                    "name": "{0}",
+                    "email": "{1}"
+                },
+                "group": {
+                    "domain": {
+                    "name": "iris"
+                    },
+                    "name": "iris-lsst-users"
+                }
+            }
+        ],
+        "remote": [
+            {
+                "type": "OIDC-preferred_username"
+            },
+            {
+                "type": "OIDC-email"
+            },
+            {
+                "regex": true,
+                "type": "OIDC-groups",
+                "any_one_of": [
+                    "lsst/desc"
+                ]
+            }
+        ]
     }
 ] 

etc/kayobe/environments/production/kolla/globals.yml

@@ -49,16 +49,20 @@ keystone_identity_mappings:
 #CASO APEL accounting
 caso_projects:
   - iris-euclid
-  - iris-dakota-ukaea
-  - iris-gaia-core
-  - iris-gaia-data
   - iris-gaia-red
-  - iris-gaia-green
   - iris-gaia-blue
+  - iris-gaia-green
+  - iris-gaia-data
   - iris-plato
   - iris-casu
-  - ska-src-cambridge
+  - iris-gaia-core
+  - ska-teal-21cm-map
   - ska-src-students-cambridge
+  - ska-src-cambridge
+  - ska-teal-lofarint
+  - ska-teal-eor
+  - ska-teal-lofar-multiwavelength
+  - iris-lsst-seedcorn
 caso_messengers:
   - ssmv4
 caso_site_name: "UK-CAM-CUMULUS"
@@ -72,26 +76,26 @@ enable_nova_libvirt_container: "{% raw %}{{ ansible_facts.distribution_major_ver
 #enable_nova_libvirt_container: false
 
 # Issues have been seen when attempting to backup the MariaDB database, mariabackup was segfaulting. This was avoided by reverting to an old MariaDB container image:
-mariabackup_image_full: "{{ docker_registry }}/stackhpc/rocky-source-mariadb-server:yoga-20230310T170929"
+#mariabackup_image_full: "{{ docker_registry }}/stackhpc/rocky-source-mariadb-server:yoga-20230310T170929"
 
 # Temporary: Manila image over-ride:
-manila_api_image_full: "{{ docker_registry }}/stackhpc/rocky-source-manila-api:yoga-20231218T141822"
-manila_data_image_full: "{{ docker_registry }}/stackhpc/rocky-source-manila-data:yoga-20231218T141822"
-manila_share_image_full: "{{ docker_registry }}/stackhpc/rocky-source-manila-share:yoga-20231218T141822"
-manila_scheduler_image_full: "{{ docker_registry }}/stackhpc/rocky-source-manila-scheduler:yoga-20231218T141822"
+#manila_api_image_full: "{{ docker_registry }}/stackhpc/rocky-source-manila-api:yoga-20231218T141822"
+#manila_data_image_full: "{{ docker_registry }}/stackhpc/rocky-source-manila-data:yoga-20231218T141822"
+#manila_share_image_full: "{{ docker_registry }}/stackhpc/rocky-source-manila-share:yoga-20231218T141822"
+#manila_scheduler_image_full: "{{ docker_registry }}/stackhpc/rocky-source-manila-scheduler:yoga-20231218T141822"
 
 # Temporary: OSSA-20424-001 image overrides for RL9 images on RL8 hosts
-nova_scheduler_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-scheduler:yoga-20240724T085253"
-nova_conductor_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-conductor:yoga-20240724T085253"
-nova_compute_ironic_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-compute-ironic:yoga-20240724T085253"
-nova_libvirt_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-libvirt:yoga-20240724T085253"
-nova_serialproxy_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-serialproxy:yoga-20240724T085253"
-nova_novncproxy_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-novncproxy:yoga-20240724T085253"
-nova_api_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-api:yoga-20240724T085253"
-nova_compute_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-compute:yoga-20240724T085253"
-nova_ssh_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-ssh:yoga-20240724T085253"
-cinder_backup_image_full: "{{ docker_registry }}/stackhpc/rocky-source-cinder-backup:yoga-20240701T132344"
-cinder_volume_image_full: "{{ docker_registry }}/stackhpc/rocky-source-cinder-volume:yoga-20240701T132344"
-cinder_scheduler_image_full: "{{ docker_registry }}/stackhpc/rocky-source-cinder-scheduler:yoga-20240701T132344"
-cinder_api_image_full: "{{ docker_registry }}/stackhpc/rocky-source-cinder-api:yoga-20240701T132344"
-glance_api_image_full: "{{ docker_registry }}/stackhpc/rocky-source-glance-api:yoga-20240702T105751"
+#nova_scheduler_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-scheduler:yoga-20240724T085253"
+#nova_conductor_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-conductor:yoga-20240724T085253"
+#nova_compute_ironic_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-compute-ironic:yoga-20240724T085253"
+#nova_libvirt_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-libvirt:yoga-20240724T085253"
+#nova_serialproxy_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-serialproxy:yoga-20240724T085253"
+#nova_novncproxy_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-novncproxy:yoga-20240724T085253"
+#nova_api_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-api:yoga-20240724T085253"
+#nova_compute_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-compute:yoga-20240724T085253"
+#nova_ssh_image_full: "{{ docker_registry }}/stackhpc/rocky-source-nova-ssh:yoga-20240724T085253"
+#cinder_backup_image_full: "{{ docker_registry }}/stackhpc/rocky-source-cinder-backup:yoga-20240701T132344"
+#cinder_volume_image_full: "{{ docker_registry }}/stackhpc/rocky-source-cinder-volume:yoga-20240701T132344"
+#cinder_scheduler_image_full: "{{ docker_registry }}/stackhpc/rocky-source-cinder-scheduler:yoga-20240701T132344"
+#cinder_api_image_full: "{{ docker_registry }}/stackhpc/rocky-source-cinder-api:yoga-20240701T132344"
+#glance_api_image_full: "{{ docker_registry }}/stackhpc/rocky-source-glance-api:yoga-20240702T105751"

etc/kayobe/environments/production/kolla/inventory/group_vars/a100_gpu_xe8545_ska/nova_cell

+---
+
+nova_cell_compute_provider_config:
+  meta:
+    schema_version: '1.0'
+  providers:
+    - identification:
+        name: "{{ inventory_hostname }}"
+      inventories:
+        additional:
+          - CUSTOM_IRIS_A100_GPU:
+              total: 4
+              reserved: 0
+              min_unit: 1
+              max_unit: 4
+              step_size: 1
+              allocation_ratio: 1.0
+      traits:
+        additional:
+          - 'CUSTOM_IRIS_A100_GPU'

etc/kayobe/environments/production/kolla/inventory/group_vars/compute-iris-c6620-srapids-20241128/nova_cell

+---
+
+nova_cell_compute_provider_config:
+  meta:
+    schema_version: '1.0'
+  providers:
+    - identification:
+        name: "{{ inventory_hostname }}"
+      traits:
+        additional:
+          - 'CUSTOM_IRIS_GAIA_CORE_SRAPIDS'

etc/kayobe/environments/production/kolla/inventory/group_vars/compute-iris-c6620-srapids-20241128/sriov

+---
+
+_enable_neutron_sriov: yes
+
+sriov_physnet_mappings:
+  ens1f0np0: physnet1

etc/kayobe/environments/production/kolla/inventory/group_vars/compute-iris-c6620-srapids-20241128/tuning

+---
+  
+enable_nested_virt: "false"
+nova_cpu_dedicated_set: "4-95,100-191"

etc/kayobe/environments/production/kolla/inventory/group_vars/compute-iris-cclake-20230206/nova_cell

+---
+
+nova_cell_compute_provider_config:
+  meta:
+    schema_version: '1.0'
+  providers:
+    - identification:
+        name: "{{ inventory_hostname }}"
+      inventories:
+        additional:
+          - CUSTOM_SKA_CPU_GENERAL:
+              total: 20
+              reserved: 0
+              min_unit: 1
+              max_unit: 20
+              step_size: 1
+              allocation_ratio: 1.0
+      traits:
+        additional:
+          - 'CUSTOM_SKA_CPU_GENERAL'

etc/kayobe/environments/production/kolla/inventory/group_vars/compute-iris-cclake-himem-20230206/nova_cell

+---
+
+nova_cell_compute_provider_config:
+  meta:
+    schema_version: '1.0'
+  providers:
+    - identification:
+        name: "{{ inventory_hostname }}"
+      inventories:
+        additional:
+          - CUSTOM_SKA_CPU_HIMEM:
+              total: 8
+              reserved: 0
+              min_unit: 1
+              max_unit: 8
+              step_size: 1
+              allocation_ratio: 1.0
+      traits:
+        additional:
+          - 'CUSTOM_SKA_CPU_HIMEM'

etc/kayobe/environments/production/kolla/inventory/group_vars/compute-rcp-pvc-gpu-20240723/nova_cell

+---
+
+nova_cell_compute_provider_config:
+  meta:
+    schema_version: '1.0'
+  providers:
+    - identification:
+        name: "{{ inventory_hostname }}"
+      inventories:
+        additional:
+          - CUSTOM_PVC_1T_GPU:
+              total: 4
+              reserved: 0
+              min_unit: 1
+              max_unit: 4
+              step_size: 1
+              allocation_ratio: 1.0
+      traits:
+        additional:
+          - 'CUSTOM_PVC_1T_GPU'

etc/kayobe/environments/production/kolla/inventory/group_vars/compute-ska-src-c6620-20240814/nova_cell

+---
+
+nova_cell_compute_provider_config:
+  meta:
+    schema_version: '1.0'
+  providers:
+    - identification:
+        name: "{{ inventory_hostname }}"
+      inventories:
+        additional:
+          - CUSTOM_SKA_CPU_GENERAL_V2:
+              total: 8
+              reserved: 0
+              min_unit: 1
+              max_unit: 8
+              step_size: 1
+              allocation_ratio: 1.0
+      traits:
+        additional:
+          - 'CUSTOM_SKA_CPU_GENERAL_V2'

etc/kayobe/environments/production/kolla/inventory/group_vars/compute-ska-src-r660-himem-20240610/nova_cell

+---
+
+nova_cell_compute_provider_config:
+  meta:
+    schema_version: '1.0'
+  providers:
+    - identification:
+        name: "{{ inventory_hostname }}"
+      inventories:
+        additional:
+          - CUSTOM_SKA_CPU_HIMEM_V2:
+              total: 8
+              reserved: 0
+              min_unit: 1
+              max_unit: 8
+              step_size: 1
+              allocation_ratio: 1.0
+      traits:
+        additional:
+          - 'CUSTOM_SKA_CPU_HIMEM_V2'

etc/kayobe/environments/production/network-allocation.yml

@@ -110,6 +110,14 @@ admin_oc_net_ips:
   nova-svn1-fr14-u12: 10.41.168.75
   nova-svn1-fr14-u14: 10.41.168.71
   nova-svn1-fr14-u16: 10.41.168.67
+  nova-svn1-fr14-u18: 10.41.168.123
+  nova-svn1-fr14-u26: 10.41.168.119
+  nova-svn1-fr14-u28: 10.41.168.115
+  nova-svn1-fr14-u30: 10.41.168.111
+  nova-svn1-fr14-u32: 10.41.168.107
+  nova-svn1-fr14-u34: 10.41.168.103
+  nova-svn1-fr14-u36: 10.41.168.99
+  nova-svn1-fr14-u38: 10.41.168.95
   nova-svn1-fr14-u40: 10.41.168.127
   nova-svn1-fr14-u6: 10.41.168.87
   nova-svn1-fr14-u8: 10.41.168.83
@@ -169,6 +177,14 @@ admin_oc_net_ips:
   nova-svn2-fr14-u11: 10.41.168.74
   nova-svn2-fr14-u13: 10.41.168.70
   nova-svn2-fr14-u15: 10.41.168.66
+  nova-svn2-fr14-u17: 10.41.168.122
+  nova-svn2-fr14-u25: 10.41.168.118
+  nova-svn2-fr14-u27: 10.41.168.114
+  nova-svn2-fr14-u29: 10.41.168.110
+  nova-svn2-fr14-u31: 10.41.168.106
+  nova-svn2-fr14-u33: 10.41.168.102
+  nova-svn2-fr14-u35: 10.41.168.98
+  nova-svn2-fr14-u37: 10.41.168.94
   nova-svn2-fr14-u39: 10.41.168.126
   nova-svn2-fr14-u5: 10.41.168.86
   nova-svn2-fr14-u7: 10.41.168.82
@@ -230,6 +246,14 @@ admin_oc_net_ips:
   nova-svn3-fr14-u12: 10.41.168.73
   nova-svn3-fr14-u14: 10.41.168.69
   nova-svn3-fr14-u16: 10.41.168.65
+  nova-svn3-fr14-u18: 10.41.168.121
+  nova-svn3-fr14-u26: 10.41.168.117
+  nova-svn3-fr14-u28: 10.41.168.113
+  nova-svn3-fr14-u30: 10.41.168.109
+  nova-svn3-fr14-u32: 10.41.168.105
+  nova-svn3-fr14-u34: 10.41.168.101
+  nova-svn3-fr14-u36: 10.41.168.97
+  nova-svn3-fr14-u38: 10.41.168.93
   nova-svn3-fr14-u40: 10.41.168.125
   nova-svn3-fr14-u6: 10.41.168.85
   nova-svn3-fr14-u8: 10.41.168.81
@@ -289,6 +313,14 @@ admin_oc_net_ips:
   nova-svn4-fr14-u11: 10.41.168.72
   nova-svn4-fr14-u13: 10.41.168.68
   nova-svn4-fr14-u15: 10.41.168.64
+  nova-svn4-fr14-u17: 10.41.168.120
+  nova-svn4-fr14-u25: 10.41.168.116
+  nova-svn4-fr14-u27: 10.41.168.112
+  nova-svn4-fr14-u29: 10.41.168.108
+  nova-svn4-fr14-u31: 10.41.168.104
+  nova-svn4-fr14-u33: 10.41.168.100
+  nova-svn4-fr14-u35: 10.41.168.96
+  nova-svn4-fr14-u37: 10.41.168.92
   nova-svn4-fr14-u39: 10.41.168.124
   nova-svn4-fr14-u5: 10.41.168.84
   nova-svn4-fr14-u7: 10.41.168.80
@@ -417,6 +449,14 @@ internal_net_ips:
   nova-svn1-fr14-u12: 10.5.1.235
   nova-svn1-fr14-u14: 10.5.1.231
   nova-svn1-fr14-u16: 10.5.1.227
+  nova-svn1-fr14-u18: 10.5.2.73
+  nova-svn1-fr14-u26: 10.5.2.69
+  nova-svn1-fr14-u28: 10.5.2.65
+  nova-svn1-fr14-u30: 10.5.2.61
+  nova-svn1-fr14-u32: 10.5.2.57
+  nova-svn1-fr14-u34: 10.5.2.53
+  nova-svn1-fr14-u36: 10.5.1.34
+  nova-svn1-fr14-u38: 10.5.1.14
   nova-svn1-fr14-u40: 10.5.2.51
   nova-svn1-fr14-u6: 10.5.1.247
   nova-svn1-fr14-u8: 10.5.1.243
@@ -476,6 +516,14 @@ internal_net_ips:
   nova-svn2-fr14-u11: 10.5.1.234
   nova-svn2-fr14-u13: 10.5.1.230
   nova-svn2-fr14-u15: 10.5.1.226
+  nova-svn2-fr14-u17: 10.5.2.72
+  nova-svn2-fr14-u25: 10.5.2.68
+  nova-svn2-fr14-u27: 10.5.2.64
+  nova-svn2-fr14-u29: 10.5.2.60
+  nova-svn2-fr14-u31: 10.5.2.56
+  nova-svn2-fr14-u33: 10.5.2.52
+  nova-svn2-fr14-u35: 10.5.1.33
+  nova-svn2-fr14-u37: 10.5.1.13
   nova-svn2-fr14-u39: 10.5.2.50
   nova-svn2-fr14-u5: 10.5.1.246
   nova-svn2-fr14-u7: 10.5.1.242
@@ -537,6 +585,14 @@ internal_net_ips:
   nova-svn3-fr14-u12: 10.5.1.233
   nova-svn3-fr14-u14: 10.5.1.229
   nova-svn3-fr14-u16: 10.5.1.225
+  nova-svn3-fr14-u18: 10.5.2.71
+  nova-svn3-fr14-u26: 10.5.2.67
+  nova-svn3-fr14-u28: 10.5.2.63
+  nova-svn3-fr14-u30: 10.5.2.59
+  nova-svn3-fr14-u32: 10.5.2.55
+  nova-svn3-fr14-u34: 10.5.1.36
+  nova-svn3-fr14-u36: 10.5.1.16
+  nova-svn3-fr14-u38: 10.5.1.12
   nova-svn3-fr14-u40: 10.5.2.49
   nova-svn3-fr14-u6: 10.5.1.245
   nova-svn3-fr14-u8: 10.5.1.241
@@ -596,6 +652,14 @@ internal_net_ips:
   nova-svn4-fr14-u11: 10.5.1.232
   nova-svn4-fr14-u13: 10.5.1.228
   nova-svn4-fr14-u15: 10.5.1.224
+  nova-svn4-fr14-u17: 10.5.2.70
+  nova-svn4-fr14-u25: 10.5.2.66
+  nova-svn4-fr14-u27: 10.5.2.62
+  nova-svn4-fr14-u29: 10.5.2.58
+  nova-svn4-fr14-u31: 10.5.2.54
+  nova-svn4-fr14-u33: 10.5.1.35
+  nova-svn4-fr14-u35: 10.5.1.15
+  nova-svn4-fr14-u37: 10.5.1.11
   nova-svn4-fr14-u39: 10.5.2.48
   nova-svn4-fr14-u5: 10.5.1.244
   nova-svn4-fr14-u7: 10.5.1.240
@@ -794,6 +858,14 @@ storage_net_ips:
   nova-svn1-fr14-u12: 10.4.201.234
   nova-svn1-fr14-u14: 10.4.201.230
   nova-svn1-fr14-u16: 10.4.201.226
+  nova-svn1-fr14-u18: 10.4.204.125
+  nova-svn1-fr14-u26: 10.4.204.121
+  nova-svn1-fr14-u28: 10.4.204.117
+  nova-svn1-fr14-u30: 10.4.204.113
+  nova-svn1-fr14-u32: 10.4.204.109
+  nova-svn1-fr14-u34: 10.4.204.105
+  nova-svn1-fr14-u36: 10.4.204.101
+  nova-svn1-fr14-u38: 10.4.204.97
   nova-svn1-fr14-u40: 10.4.204.89
   nova-svn1-fr14-u6: 10.4.201.246
   nova-svn1-fr14-u8: 10.4.201.242
@@ -853,6 +925,14 @@ storage_net_ips:
   nova-svn2-fr14-u11: 10.4.201.233
   nova-svn2-fr14-u13: 10.4.201.229
   nova-svn2-fr14-u15: 10.4.201.225
+  nova-svn2-fr14-u17: 10.4.204.124
+  nova-svn2-fr14-u25: 10.4.204.120
+  nova-svn2-fr14-u27: 10.4.204.116
+  nova-svn2-fr14-u29: 10.4.204.112
+  nova-svn2-fr14-u31: 10.4.204.108
+  nova-svn2-fr14-u33: 10.4.204.104
+  nova-svn2-fr14-u35: 10.4.204.100
+  nova-svn2-fr14-u37: 10.4.204.96
   nova-svn2-fr14-u39: 10.4.204.88
   nova-svn2-fr14-u5: 10.4.201.245
   nova-svn2-fr14-u7: 10.4.201.241
@@ -914,6 +994,14 @@ storage_net_ips:
   nova-svn3-fr14-u12: 10.4.201.232
   nova-svn3-fr14-u14: 10.4.201.228
   nova-svn3-fr14-u16: 10.4.201.224
+  nova-svn3-fr14-u18: 10.4.204.123
+  nova-svn3-fr14-u26: 10.4.204.119
+  nova-svn3-fr14-u28: 10.4.204.115
+  nova-svn3-fr14-u30: 10.4.204.111
+  nova-svn3-fr14-u32: 10.4.204.107
+  nova-svn3-fr14-u34: 10.4.204.103
+  nova-svn3-fr14-u36: 10.4.204.99
+  nova-svn3-fr14-u38: 10.4.204.95
   nova-svn3-fr14-u40: 10.4.204.87
   nova-svn3-fr14-u6: 10.4.201.244
   nova-svn3-fr14-u8: 10.4.201.240
@@ -973,6 +1061,14 @@ storage_net_ips:
   nova-svn4-fr14-u11: 10.4.201.231
   nova-svn4-fr14-u13: 10.4.201.227
   nova-svn4-fr14-u15: 10.4.201.223
+  nova-svn4-fr14-u17: 10.4.204.122
+  nova-svn4-fr14-u25: 10.4.204.118
+  nova-svn4-fr14-u27: 10.4.204.114
+  nova-svn4-fr14-u29: 10.4.204.110
+  nova-svn4-fr14-u31: 10.4.204.106
+  nova-svn4-fr14-u33: 10.4.204.102
+  nova-svn4-fr14-u35: 10.4.204.98
+  nova-svn4-fr14-u37: 10.4.204.94
   nova-svn4-fr14-u39: 10.4.204.86
   nova-svn4-fr14-u5: 10.4.201.243
   nova-svn4-fr14-u7: 10.4.201.239
@@ -1091,6 +1187,14 @@ tunnel_net_ips:
   nova-svn1-fr14-u12: 10.17.1.234
   nova-svn1-fr14-u14: 10.17.1.230
   nova-svn1-fr14-u16: 10.17.1.226
+  nova-svn1-fr14-u18: 10.17.2.71
+  nova-svn1-fr14-u26: 10.17.2.67
+  nova-svn1-fr14-u28: 10.17.2.63
+  nova-svn1-fr14-u30: 10.17.2.59
+  nova-svn1-fr14-u32: 10.17.2.55
+  nova-svn1-fr14-u34: 10.17.2.51
+  nova-svn1-fr14-u36: 10.17.1.33
+  nova-svn1-fr14-u38: 10.17.1.13
   nova-svn1-fr14-u40: 10.17.2.49
   nova-svn1-fr14-u6: 10.17.1.246
   nova-svn1-fr14-u8: 10.17.1.242
@@ -1150,6 +1254,14 @@ tunnel_net_ips:
   nova-svn2-fr14-u11: 10.17.1.233
   nova-svn2-fr14-u13: 10.17.1.229
   nova-svn2-fr14-u15: 10.17.1.225
+  nova-svn2-fr14-u17: 10.17.2.70
+  nova-svn2-fr14-u25: 10.17.2.66
+  nova-svn2-fr14-u27: 10.17.2.62
+  nova-svn2-fr14-u29: 10.17.2.58
+  nova-svn2-fr14-u31: 10.17.2.54
+  nova-svn2-fr14-u33: 10.17.2.50
+  nova-svn2-fr14-u35: 10.17.1.32
+  nova-svn2-fr14-u37: 10.17.1.12
   nova-svn2-fr14-u39: 10.17.2.48
   nova-svn2-fr14-u5: 10.17.1.245
   nova-svn2-fr14-u7: 10.17.1.241
@@ -1211,6 +1323,14 @@ tunnel_net_ips:
   nova-svn3-fr14-u12: 10.17.1.232
   nova-svn3-fr14-u14: 10.17.1.228
   nova-svn3-fr14-u16: 10.17.1.224
+  nova-svn3-fr14-u18: 10.17.2.69
+  nova-svn3-fr14-u26: 10.17.2.65
+  nova-svn3-fr14-u28: 10.17.2.61
+  nova-svn3-fr14-u30: 10.17.2.57
+  nova-svn3-fr14-u32: 10.17.2.53
+  nova-svn3-fr14-u34: 10.17.1.146
+  nova-svn3-fr14-u36: 10.17.1.31
+  nova-svn3-fr14-u38: 10.17.1.11
   nova-svn3-fr14-u40: 10.17.2.47
   nova-svn3-fr14-u6: 10.17.1.244
   nova-svn3-fr14-u8: 10.17.1.240
@@ -1270,6 +1390,14 @@ tunnel_net_ips:
   nova-svn4-fr14-u11: 10.17.1.231
   nova-svn4-fr14-u13: 10.17.1.227
   nova-svn4-fr14-u15: 10.17.1.223
+  nova-svn4-fr14-u17: 10.17.2.68
+  nova-svn4-fr14-u25: 10.17.2.64
+  nova-svn4-fr14-u27: 10.17.2.60
+  nova-svn4-fr14-u29: 10.17.2.56
+  nova-svn4-fr14-u31: 10.17.2.52
+  nova-svn4-fr14-u33: 10.17.1.34
+  nova-svn4-fr14-u35: 10.17.1.14
+  nova-svn4-fr14-u37: 10.17.1.10
   nova-svn4-fr14-u39: 10.17.2.46
   nova-svn4-fr14-u5: 10.17.1.243
   nova-svn4-fr14-u7: 10.17.1.239