SI MOCK lab improves
Update net config to reduce
metadata size (is too long (HTTP 400))
Releated-PROD: PRODX-5044
Change-Id: Id0445c33d619428c549b8719d8d125674a2db4ae
diff --git a/de/heat-templates/env/bmt410-mstr3-wrkr3-cmp0-gtw0-osd3.yaml b/de/heat-templates/env/bmt410-mstr3-wrkr3-cmp0-gtw0-osd3.yaml
index d8630d4..35c5ddb 100644
--- a/de/heat-templates/env/bmt410-mstr3-wrkr3-cmp0-gtw0-osd3.yaml
+++ b/de/heat-templates/env/bmt410-mstr3-wrkr3-cmp0-gtw0-osd3.yaml
@@ -90,32 +90,13 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - 172.16.50.130/25
+ k8s-control: { id: 411, link: bond0, addresses: [ 172.16.50.130/25 ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
- ceph-control:
- id: 415
- link: bond1
- addresses:
- - {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
- mtu: 9100
- os-tenant:
- id: 416
- link: bond1
- addresses:
- - 10.14.0.10/24
- mtu: 9100
- ceph-replica:
- id: 417
- link: bond0
- addresses:
- - {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }}
- mtu: 9100
+ ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
+ os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.10/24 ], mtu: 9100 }
+ ceph-replica: { id: 417, link: bond0, addresses: [ {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }} ], mtu: 9100 }
'0c:c4:7a:33:26:6e':
write_files:
- path: /usr/share/metadata/ceph.yaml
@@ -159,32 +140,13 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - 172.16.50.131/25
+ k8s-control: { id: 411, link: bond0, addresses: [ 172.16.50.131/25 ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
- ceph-control:
- id: 415
- link: bond1
- addresses:
- - {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
- mtu: 9100
- os-tenant:
- id: 416
- link: bond1
- addresses:
- - 10.14.0.11/24
- mtu: 9100
- ceph-replica:
- id: 417
- link: bond0
- addresses:
- - {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }}
- mtu: 9100
+ ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
+ os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.11/24 ], mtu: 9100 }
+ ceph-replica: { id: 417, link: bond0, addresses: [ {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }} ], mtu: 9100 }
'0c:c4:7a:33:26:6a':
write_files:
- path: /usr/share/metadata/ceph.yaml
@@ -228,32 +190,13 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - 172.16.50.132/25
+ k8s-control: { id: 411, link: bond0, addresses: [ 172.16.50.132/25 ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
- ceph-control:
- id: 415
- link: bond1
- addresses:
- - {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
- mtu: 9100
- os-tenant:
- id: 416
- link: bond1
- addresses:
- - 10.14.0.12/24
- mtu: 9100
- ceph-replica:
- id: 417
- link: bond0
- addresses:
- - {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }}
- mtu: 9100
+ ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
+ os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.12/24 ], mtu: 9100 }
+ ceph-replica: { id: 417, link: bond0, addresses: [ {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }} ], mtu: 9100 }
'0c:c4:7a:34:92:94':
write_files:
- path: '/etc/netplan/99-cz7727-spare.yaml'
@@ -283,32 +226,13 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - 172.16.50.133/25
+ k8s-control: { id: 411, link: bond0, addresses: [ 172.16.50.133/25 ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
- ceph-control:
- id: 415
- link: bond1
- addresses:
- - {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
- mtu: 9100
- os-tenant:
- id: 416
- link: bond1
- addresses:
- - 10.14.0.13/24
- mtu: 9100
- ceph-replica:
- id: 417
- link: bond0
- addresses:
- - {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }}
- mtu: 9100
+ ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
+ os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.13/24 ], mtu: 9100 }
+ ceph-replica: { id: 417, link: bond0, addresses: [ {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }} ], mtu: 9100 }
'0c:c4:7a:aa:e0:9e':
write_files:
- path: '/etc/netplan/99-cz10095-os-control.yaml'
@@ -338,26 +262,12 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - 172.16.50.134/25
+ k8s-control: { id: 411, link: bond0, addresses: [ 172.16.50.134/25 ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
- ceph-control:
- id: 415
- link: bond1
- addresses:
- - {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
- mtu: 9100
- os-tenant:
- id: 416
- link: bond1
- addresses:
- - 10.14.0.14/24
- mtu: 9100
+ ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
+ os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.14/24 ], mtu: 9100 }
'0c:c4:7a:aa:e0:9c':
write_files:
- path: '/etc/netplan/99-cz10096-os-control.yaml'
@@ -387,26 +297,12 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - 172.16.50.135/25
+ k8s-control: { id: 411, link: bond0, addresses: [ 172.16.50.135/25 ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
- ceph-control:
- id: 415
- link: bond1
- addresses:
- - {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
- mtu: 9100
- os-tenant:
- id: 416
- link: bond1
- addresses:
- - 10.14.0.15/24
- mtu: 9100
+ ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
+ os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.15/24 ], mtu: 9100 }
'0c:c4:7a:aa:78:2c':
write_files:
- path: '/etc/netplan/99-cz10097-os-control.yaml'
@@ -436,26 +332,12 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - 172.16.50.136/25
+ k8s-control: { id: 411, link: bond0, addresses: [ 172.16.50.136/25 ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
- ceph-control:
- id: 415
- link: bond1
- addresses:
- - {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
- mtu: 9100
- os-tenant:
- id: 416
- link: bond1
- addresses:
- - 10.14.0.16/24
- mtu: 9100
+ ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
+ os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.16/24 ], mtu: 9100 }
'0c:c4:7a:aa:78:7a':
write_files:
- path: '/etc/netplan/99-cz10098-ucp-control.yaml'
@@ -485,11 +367,7 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - {% if UCP_MASTER_HOST == "" %}172.16.50.254/25{% else %}172.16.50.137/25{% endif %}
+ k8s-control: { id: 411, link: bond0, addresses: [ {% if UCP_MASTER_HOST == "" %}172.16.50.254/25{% else %}172.16.50.137/25{% endif %} ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
@@ -522,11 +400,7 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - {% if UCP_MASTER_HOST == "" %}172.16.50.254/25{% else %}172.16.50.138/25{% endif %}
+ k8s-control: { id: 411, link: bond0, addresses: [ {% if UCP_MASTER_HOST == "" %}172.16.50.254/25{% else %}172.16.50.138/25{% endif %} ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
@@ -559,11 +433,7 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - {% if UCP_MASTER_HOST == "" %}172.16.50.254/25{% else %}172.16.50.139/25{% endif %}
+ k8s-control: { id: 411, link: bond0, addresses: [ {% if UCP_MASTER_HOST == "" %}172.16.50.254/25{% else %}172.16.50.139/25{% endif %} ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
@@ -596,26 +466,12 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - 172.16.50.140/25
+ k8s-control: { id: 411, link: bond0, addresses: [ 172.16.50.140/25 ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
- ceph-control:
- id: 415
- link: bond1
- addresses:
- - {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
- mtu: 9100
- os-tenant:
- id: 416
- link: bond1
- addresses:
- - 10.14.0.17/24
- mtu: 9100
+ ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
+ os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.17/24 ], mtu: 9100 }
'0c:c4:7a:54:a2:5e':
write_files:
- path: '/etc/netplan/99-cz7641-os-compute.yaml'
@@ -645,26 +501,12 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - 172.16.50.141/25
+ k8s-control: { id: 411, link: bond0, addresses: [ 172.16.50.141/25 ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
- ceph-control:
- id: 415
- link: bond1
- addresses:
- - {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
- mtu: 9100
- os-tenant:
- id: 416
- link: bond1
- addresses:
- - 10.14.0.18/24
- mtu: 9100
+ ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
+ os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.18/24 ], mtu: 9100 }
'0c:c4:7a:54:a0:50':
write_files:
- path: '/etc/netplan/99-cz7642-os-compute.yaml'
@@ -694,11 +536,7 @@
mii-monitor-interval: 1000
mtu: 9100
vlans:
- k8s-control:
- id: 411
- link: bond0
- addresses:
- - 172.16.50.142/25
+ k8s-control: { id: 411, link: bond0, addresses: [ 172.16.50.142/25 ] }
os-floating: { id: 412, link: bond1 }
k8s-metallb: { id: 413, link: bond0 }
management: { id: 414, link: bond0 }
@@ -708,12 +546,7 @@
addresses:
- {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
mtu: 9100
- os-tenant:
- id: 416
- link: bond1
- addresses:
- - 10.14.0.19/24
- mtu: 9100
+ os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.19/24 ], mtu: 9100 }
functions_override: |