From 6f371b122017836cde55f209a251257961db196d Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 1 Feb 2018 17:11:42 -0600 Subject: [PATCH] Regenerate network templates The only actual change is some parameter descriptions so that they are consistent with the ones in tripleo-heat-templates. --- .../nic-configs/ceph-storage.yaml | 4 +- .../nic-configs/cinder-storage.yaml | 4 +- .../nic-configs/compute.yaml | 4 +- .../nic-configs/controller.yaml | 4 +- .../nic-configs/swift-storage.yaml | 4 +- .../nic-configs/ceph-storage.yaml | 4 +- .../nic-configs/cinder-storage.yaml | 4 +- .../nic-configs/compute.yaml | 4 +- .../nic-configs/controller.yaml | 4 +- .../nic-configs/swift-storage.yaml | 4 +- .../nic-configs/ceph-storage.yaml | 4 +- .../nic-configs/cinder-storage.yaml | 4 +- .../nic-configs/compute.yaml | 4 +- .../nic-configs/controller.yaml | 4 +- .../nic-configs/swift-storage.yaml | 4 +- .../nic-configs/ceph-storage.yaml | 4 +- .../nic-configs/cinder-storage.yaml | 4 +- .../nic-configs/compute.yaml | 4 +- .../nic-configs/controller.yaml | 4 +- .../nic-configs/swift-storage.yaml | 4 +- .../ipv6-network-templates/ui-settings.pickle | 1027 +++++++++-------- .../nic-configs/ceph-storage.yaml | 4 +- .../nic-configs/cinder-storage.yaml | 4 +- .../nic-configs/compute.yaml | 4 +- .../nic-configs/controller.yaml | 4 +- .../nic-configs/swift-storage.yaml | 4 +- .../nic-configs/ceph-storage.yaml | 4 +- .../nic-configs/cinder-storage.yaml | 4 +- .../nic-configs/compute.yaml | 4 +- .../nic-configs/controller.yaml | 4 +- .../nic-configs/swift-storage.yaml | 4 +- .../network-templates/ui-settings.pickle | 889 +++++++------- 32 files changed, 1021 insertions(+), 1015 deletions(-) diff --git a/overcloud-templates/bond-network-templates-v2/nic-configs/ceph-storage.yaml b/overcloud-templates/bond-network-templates-v2/nic-configs/ceph-storage.yaml index 63d3890..a2f4a6d 100644 --- a/overcloud-templates/bond-network-templates-v2/nic-configs/ceph-storage.yaml +++ b/overcloud-templates/bond-network-templates-v2/nic-configs/ceph-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/bond-network-templates-v2/nic-configs/cinder-storage.yaml b/overcloud-templates/bond-network-templates-v2/nic-configs/cinder-storage.yaml index 6010867..160cfca 100644 --- a/overcloud-templates/bond-network-templates-v2/nic-configs/cinder-storage.yaml +++ b/overcloud-templates/bond-network-templates-v2/nic-configs/cinder-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/bond-network-templates-v2/nic-configs/compute.yaml b/overcloud-templates/bond-network-templates-v2/nic-configs/compute.yaml index ebccd07..52ab9b6 100644 --- a/overcloud-templates/bond-network-templates-v2/nic-configs/compute.yaml +++ b/overcloud-templates/bond-network-templates-v2/nic-configs/compute.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/bond-network-templates-v2/nic-configs/controller.yaml b/overcloud-templates/bond-network-templates-v2/nic-configs/controller.yaml index fc41891..8bcda0c 100644 --- a/overcloud-templates/bond-network-templates-v2/nic-configs/controller.yaml +++ b/overcloud-templates/bond-network-templates-v2/nic-configs/controller.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/bond-network-templates-v2/nic-configs/swift-storage.yaml b/overcloud-templates/bond-network-templates-v2/nic-configs/swift-storage.yaml index 6010867..160cfca 100644 --- a/overcloud-templates/bond-network-templates-v2/nic-configs/swift-storage.yaml +++ b/overcloud-templates/bond-network-templates-v2/nic-configs/swift-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/bond-network-templates/nic-configs/ceph-storage.yaml b/overcloud-templates/bond-network-templates/nic-configs/ceph-storage.yaml index 5500ebc..1a2fb55 100644 --- a/overcloud-templates/bond-network-templates/nic-configs/ceph-storage.yaml +++ b/overcloud-templates/bond-network-templates/nic-configs/ceph-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/bond-network-templates/nic-configs/cinder-storage.yaml b/overcloud-templates/bond-network-templates/nic-configs/cinder-storage.yaml index f16920d..9e9ae5b 100644 --- a/overcloud-templates/bond-network-templates/nic-configs/cinder-storage.yaml +++ b/overcloud-templates/bond-network-templates/nic-configs/cinder-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/bond-network-templates/nic-configs/compute.yaml b/overcloud-templates/bond-network-templates/nic-configs/compute.yaml index 3edec60..34a0ce3 100644 --- a/overcloud-templates/bond-network-templates/nic-configs/compute.yaml +++ b/overcloud-templates/bond-network-templates/nic-configs/compute.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/bond-network-templates/nic-configs/controller.yaml b/overcloud-templates/bond-network-templates/nic-configs/controller.yaml index b817058..195fb6f 100644 --- a/overcloud-templates/bond-network-templates/nic-configs/controller.yaml +++ b/overcloud-templates/bond-network-templates/nic-configs/controller.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/bond-network-templates/nic-configs/swift-storage.yaml b/overcloud-templates/bond-network-templates/nic-configs/swift-storage.yaml index f16920d..9e9ae5b 100644 --- a/overcloud-templates/bond-network-templates/nic-configs/swift-storage.yaml +++ b/overcloud-templates/bond-network-templates/nic-configs/swift-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates-v2/nic-configs/ceph-storage.yaml b/overcloud-templates/ipv6-network-templates-v2/nic-configs/ceph-storage.yaml index efb27d0..dcd3533 100644 --- a/overcloud-templates/ipv6-network-templates-v2/nic-configs/ceph-storage.yaml +++ b/overcloud-templates/ipv6-network-templates-v2/nic-configs/ceph-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates-v2/nic-configs/cinder-storage.yaml b/overcloud-templates/ipv6-network-templates-v2/nic-configs/cinder-storage.yaml index 6010867..160cfca 100644 --- a/overcloud-templates/ipv6-network-templates-v2/nic-configs/cinder-storage.yaml +++ b/overcloud-templates/ipv6-network-templates-v2/nic-configs/cinder-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates-v2/nic-configs/compute.yaml b/overcloud-templates/ipv6-network-templates-v2/nic-configs/compute.yaml index 8dcb350..882121e 100644 --- a/overcloud-templates/ipv6-network-templates-v2/nic-configs/compute.yaml +++ b/overcloud-templates/ipv6-network-templates-v2/nic-configs/compute.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates-v2/nic-configs/controller.yaml b/overcloud-templates/ipv6-network-templates-v2/nic-configs/controller.yaml index bc945e9..389c433 100644 --- a/overcloud-templates/ipv6-network-templates-v2/nic-configs/controller.yaml +++ b/overcloud-templates/ipv6-network-templates-v2/nic-configs/controller.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates-v2/nic-configs/swift-storage.yaml b/overcloud-templates/ipv6-network-templates-v2/nic-configs/swift-storage.yaml index 6010867..160cfca 100644 --- a/overcloud-templates/ipv6-network-templates-v2/nic-configs/swift-storage.yaml +++ b/overcloud-templates/ipv6-network-templates-v2/nic-configs/swift-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates/nic-configs/ceph-storage.yaml b/overcloud-templates/ipv6-network-templates/nic-configs/ceph-storage.yaml index 593533b..21fd59c 100644 --- a/overcloud-templates/ipv6-network-templates/nic-configs/ceph-storage.yaml +++ b/overcloud-templates/ipv6-network-templates/nic-configs/ceph-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates/nic-configs/cinder-storage.yaml b/overcloud-templates/ipv6-network-templates/nic-configs/cinder-storage.yaml index f16920d..9e9ae5b 100644 --- a/overcloud-templates/ipv6-network-templates/nic-configs/cinder-storage.yaml +++ b/overcloud-templates/ipv6-network-templates/nic-configs/cinder-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates/nic-configs/compute.yaml b/overcloud-templates/ipv6-network-templates/nic-configs/compute.yaml index ebe9f69..794b913 100644 --- a/overcloud-templates/ipv6-network-templates/nic-configs/compute.yaml +++ b/overcloud-templates/ipv6-network-templates/nic-configs/compute.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates/nic-configs/controller.yaml b/overcloud-templates/ipv6-network-templates/nic-configs/controller.yaml index 500fbbd..313e807 100644 --- a/overcloud-templates/ipv6-network-templates/nic-configs/controller.yaml +++ b/overcloud-templates/ipv6-network-templates/nic-configs/controller.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates/nic-configs/swift-storage.yaml b/overcloud-templates/ipv6-network-templates/nic-configs/swift-storage.yaml index f16920d..9e9ae5b 100644 --- a/overcloud-templates/ipv6-network-templates/nic-configs/swift-storage.yaml +++ b/overcloud-templates/ipv6-network-templates/nic-configs/swift-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/ipv6-network-templates/ui-settings.pickle b/overcloud-templates/ipv6-network-templates/ui-settings.pickle index bc3ac5a..556326c 100644 --- a/overcloud-templates/ipv6-network-templates/ui-settings.pickle +++ b/overcloud-templates/ipv6-network-templates/ui-settings.pickle @@ -66,664 +66,667 @@ sS'bond_options' p30 V p31 -sS'external' +sS'version' p32 -(dp33 +I1 +sS'external' +p33 +(dp34 S'bridge' -p34 -V'' p35 +V'' +p36 sg18 V2001:db8:fd00:1000:ffff:ffff:ffff:fffe -p36 +p37 sg17 I1 sg13 V2001:db8:fd00:1000::10 -p37 +p38 sg15 V2001:db8:fd00:1000::/64 -p38 -sS'gateway' p39 -V2001:db8:fd00:1000::1 +sS'gateway' p40 -ssS'internal_api' +V2001:db8:fd00:1000::1 p41 -(dp42 +ssS'internal_api' +p42 +(dp43 g13 Vfd00:fd00:fd00:2000::10 -p43 +p44 sg15 Vfd00:fd00:fd00:2000::/64 -p44 +p45 sg17 I2 sg18 Vfd00:fd00:fd00:2000:ffff:ffff:ffff:fffe -p45 -ssS'ipv6' p46 +ssS'ipv6' +p47 I01 sS'storage_mgmt' -p47 -(dp48 +p48 +(dp49 g13 Vfd00:fd00:fd00:4000::10 -p49 +p50 sg15 Vfd00:fd00:fd00:4000::/64 -p50 +p51 sg17 I4 sg18 Vfd00:fd00:fd00:4000:ffff:ffff:ffff:fffe -p51 -ssS'minor' p52 +ssS'minor' +p53 I2 sS'tenant' -p53 -(dp54 +p54 +(dp55 g13 V172.16.0.10 -p55 +p56 sg15 V172.16.0.0/24 -p56 +p57 sg17 I5 sg18 V172.16.0.250 -p57 -sssS'data' p58 -(dp59 +sssS'data' +p59 +(dp60 S'cinder-storage.yaml' -p60 -(lp61 +p61 +(lp62 sS'ceph-storage.yaml' -p62 -(lp63 -(dp64 +p63 +(lp64 +(dp65 Vaddresses -p65 -(lp66 +p66 +(lp67 sVnetwork -p67 -VControlPlane p68 -sVprimary +VControlPlane p69 +sVprimary +p70 I01 sVmtu -p70 +p71 I1350 sS'members' -p71 -(lp72 -(dp73 +p72 +(lp73 +(dp74 Vip_netmask -p74 -V0.0.0.0/0 p75 -sVname +V0.0.0.0/0 p76 -VRoute +sVname p77 -sVdefault +VRoute p78 -I01 -sVnext_hop +sVdefault p79 -V{get_param: ControlPlaneDefaultRoute} +I01 +sVnext_hop p80 -sg71 -(lp81 +V{get_param: ControlPlaneDefaultRoute} +p81 +sg72 +(lp82 sVtype -p82 -Vroute p83 -sasVroutes +Vroute p84 -(lp85 +sasVroutes +p85 +(lp86 sVuse_dhcp -p86 -I00 -sVtype p87 -Vinterface +I00 +sVtype p88 -sVname +Vinterface p89 -Vnic1 +sVname p90 -sa(dp91 +Vnic1 +p91 +sa(dp92 Vaddresses -p92 -(lp93 +p93 +(lp94 sVnetwork -p94 -VStorage p95 -sVprimary +VStorage p96 -I01 -sVmtu +sVprimary p97 +I01 +sVmtu +p98 I1350 -sg71 -(lp98 +sg72 +(lp99 sVroutes -p99 -(lp100 +p100 +(lp101 sVuse_dhcp -p101 -I00 -sVtype p102 -Vinterface +I00 +sVtype p103 -sVname +Vinterface p104 -Vnic4 +sVname p105 -sa(dp106 +Vnic4 +p106 +sa(dp107 Vaddresses -p107 -(lp108 +p108 +(lp109 sVnetwork -p109 -VStorageMgmt p110 -sVprimary -p111 -I01 -sVmtu -p112 -I1350 -sg71 -(lp113 -sVroutes -p114 -(lp115 -sVuse_dhcp -p116 -I00 -sVtype -p117 -Vinterface -p118 -sVname -p119 -Vnic5 -p120 -sasS'controller.yaml' -p121 -(lp122 -(dp123 -Vaddresses -p124 -(lp125 -sVnetwork -p126 -VControlPlane -p127 -sVprimary -p128 -I01 -sVmtu -p129 -I1350 -sg71 -(lp130 -(dp131 -Vip_netmask -p132 -V0.0.0.0/0 -p133 -sVname -p134 -VRoute -p135 -sVdefault -p136 -I01 -sVnext_hop -p137 -V{get_param: ControlPlaneDefaultRoute} -p138 -sg71 -(lp139 -sVtype -p140 -Vroute -p141 -sasVroutes -p142 -(lp143 -sVuse_dhcp -p144 -I00 -sVtype -p145 -Vinterface -p146 -sVname -p147 -Vnic1 -p148 -sa(dp149 -Vdns_servers -p150 -V{get_param: DnsServers} -p151 -sVaddresses -p152 -(lp153 -sVnetwork -p154 -VExternal -p155 -sVmtu -p156 -I-1 -sg71 -(lp157 -(dp158 -Vaddresses -p159 -(lp160 -sVnetwork -p161 -VNone -p162 -sVprimary -p163 -I01 -sVmtu -p164 -I1350 -sg71 -(lp165 -sVroutes -p166 -(lp167 -sVuse_dhcp -p168 -I00 -sVtype -p169 -Vinterface -p170 -sVname -p171 -Vnic2 -p172 -sa(dp173 -Vip_netmask -p174 -V0.0.0.0/0 -p175 -sVname -p176 -VRoute -p177 -sVdefault -p178 -I01 -sVnext_hop -p179 -V{get_param: ExternalInterfaceDefaultRoute} -p180 -sg71 -(lp181 -sVtype -p182 -Vroute -p183 -sasVroutes -p184 -(lp185 -sVuse_dhcp -p186 -I00 -sVtype -p187 -Vovs_bridge -p188 -sVname -p189 -Vbr-ex -p190 -sa(dp191 -Vaddresses -p192 -(lp193 -sVnetwork -p194 -VInternalApi -p195 -sVprimary -p196 -I01 -sVmtu -p197 -I1350 -sg71 -(lp198 -sVroutes -p199 -(lp200 -sVuse_dhcp -p201 -I00 -sVtype -p202 -Vinterface -p203 -sVname -p204 -Vnic3 -p205 -sa(dp206 -Vaddresses -p207 -(lp208 -sVnetwork -p209 -VStorage -p210 -sVprimary -p211 -I01 -sVmtu -p212 -I1350 -sg71 -(lp213 -sVroutes -p214 -(lp215 -sVuse_dhcp -p216 -I00 -sVtype -p217 -Vinterface -p218 -sVname -p219 -Vnic4 -p220 -sa(dp221 -Vaddresses -p222 -(lp223 -sVnetwork -p224 VStorageMgmt -p225 +p111 sVprimary -p226 +p112 I01 sVmtu -p227 +p113 I1350 -sg71 -(lp228 +sg72 +(lp114 sVroutes -p229 -(lp230 +p115 +(lp116 sVuse_dhcp -p231 +p117 I00 sVtype -p232 +p118 Vinterface -p233 +p119 sVname -p234 +p120 Vnic5 -p235 -sa(dp236 -Vdns_servers -p237 -V{get_param: DnsServers} -p238 -sVaddresses -p239 -(lp240 -sVnetwork -p241 -VTenant -p242 -sVmtu -p243 -I-1 -sg71 -(lp244 -(dp245 +p121 +sasS'controller.yaml' +p122 +(lp123 +(dp124 Vaddresses -p246 -(lp247 +p125 +(lp126 sVnetwork -p248 -VNone -p249 -sVprimary -p250 -I01 -sVmtu -p251 -I1350 -sg71 -(lp252 -sVroutes -p253 -(lp254 -sVuse_dhcp -p255 -I00 -sVtype -p256 -Vinterface -p257 -sVname -p258 -Vnic6 -p259 -sasVroutes -p260 -(lp261 -sVuse_dhcp -p262 -I00 -sVtype -p263 -Vovs_bridge -p264 -sVname -p265 -Vbr-tenant -p266 -sasS'swift-storage.yaml' -p267 -(lp268 -sS'compute.yaml' -p269 -(lp270 -(dp271 -Vaddresses -p272 -(lp273 -sVnetwork -p274 +p127 VControlPlane -p275 +p128 sVprimary -p276 +p129 I01 sVmtu -p277 +p130 I1350 -sg71 -(lp278 -(dp279 +sg72 +(lp131 +(dp132 Vip_netmask -p280 +p133 V0.0.0.0/0 -p281 +p134 sVname -p282 +p135 VRoute -p283 +p136 sVdefault -p284 +p137 I01 sVnext_hop -p285 +p138 V{get_param: ControlPlaneDefaultRoute} -p286 -sg71 -(lp287 +p139 +sg72 +(lp140 sVtype -p288 +p141 Vroute -p289 +p142 sasVroutes -p290 -(lp291 +p143 +(lp144 sVuse_dhcp -p292 +p145 I00 sVtype -p293 +p146 Vinterface -p294 +p147 sVname -p295 +p148 Vnic1 -p296 -sa(dp297 -Vaddresses -p298 -(lp299 -sVnetwork -p300 -VInternalApi -p301 -sVprimary -p302 -I01 -sVmtu -p303 -I1350 -sg71 -(lp304 -sVroutes -p305 -(lp306 -sVuse_dhcp -p307 -I00 -sVtype -p308 -Vinterface -p309 -sVname -p310 -Vnic3 -p311 -sa(dp312 -Vaddresses -p313 -(lp314 -sVnetwork -p315 -VStorage -p316 -sVprimary -p317 -I01 -sVmtu -p318 -I1350 -sg71 -(lp319 -sVroutes -p320 -(lp321 -sVuse_dhcp -p322 -I00 -sVtype -p323 -Vinterface -p324 -sVname -p325 -Vnic4 -p326 -sa(dp327 +p149 +sa(dp150 Vdns_servers -p328 +p151 V{get_param: DnsServers} -p329 +p152 sVaddresses -p330 -(lp331 +p153 +(lp154 sVnetwork -p332 -VTenant -p333 +p155 +VExternal +p156 sVmtu -p334 +p157 I-1 -sg71 -(lp335 -(dp336 +sg72 +(lp158 +(dp159 Vaddresses -p337 -(lp338 +p160 +(lp161 sVnetwork -p339 +p162 VNone -p340 +p163 sVprimary -p341 +p164 I01 sVmtu -p342 +p165 I1350 -sg71 -(lp343 +sg72 +(lp166 sVroutes -p344 -(lp345 +p167 +(lp168 sVuse_dhcp -p346 +p169 I00 sVtype -p347 +p170 Vinterface -p348 +p171 sVname -p349 -Vnic6 -p350 +p172 +Vnic2 +p173 +sa(dp174 +Vip_netmask +p175 +V0.0.0.0/0 +p176 +sVname +p177 +VRoute +p178 +sVdefault +p179 +I01 +sVnext_hop +p180 +V{get_param: ExternalInterfaceDefaultRoute} +p181 +sg72 +(lp182 +sVtype +p183 +Vroute +p184 sasVroutes -p351 -(lp352 +p185 +(lp186 sVuse_dhcp -p353 +p187 I00 sVtype -p354 +p188 Vovs_bridge -p355 +p189 sVname -p356 +p190 +Vbr-ex +p191 +sa(dp192 +Vaddresses +p193 +(lp194 +sVnetwork +p195 +VInternalApi +p196 +sVprimary +p197 +I01 +sVmtu +p198 +I1350 +sg72 +(lp199 +sVroutes +p200 +(lp201 +sVuse_dhcp +p202 +I00 +sVtype +p203 +Vinterface +p204 +sVname +p205 +Vnic3 +p206 +sa(dp207 +Vaddresses +p208 +(lp209 +sVnetwork +p210 +VStorage +p211 +sVprimary +p212 +I01 +sVmtu +p213 +I1350 +sg72 +(lp214 +sVroutes +p215 +(lp216 +sVuse_dhcp +p217 +I00 +sVtype +p218 +Vinterface +p219 +sVname +p220 +Vnic4 +p221 +sa(dp222 +Vaddresses +p223 +(lp224 +sVnetwork +p225 +VStorageMgmt +p226 +sVprimary +p227 +I01 +sVmtu +p228 +I1350 +sg72 +(lp229 +sVroutes +p230 +(lp231 +sVuse_dhcp +p232 +I00 +sVtype +p233 +Vinterface +p234 +sVname +p235 +Vnic5 +p236 +sa(dp237 +Vdns_servers +p238 +V{get_param: DnsServers} +p239 +sVaddresses +p240 +(lp241 +sVnetwork +p242 +VTenant +p243 +sVmtu +p244 +I-1 +sg72 +(lp245 +(dp246 +Vaddresses +p247 +(lp248 +sVnetwork +p249 +VNone +p250 +sVprimary +p251 +I01 +sVmtu +p252 +I1350 +sg72 +(lp253 +sVroutes +p254 +(lp255 +sVuse_dhcp +p256 +I00 +sVtype +p257 +Vinterface +p258 +sVname +p259 +Vnic6 +p260 +sasVroutes +p261 +(lp262 +sVuse_dhcp +p263 +I00 +sVtype +p264 +Vovs_bridge +p265 +sVname +p266 Vbr-tenant +p267 +sasS'swift-storage.yaml' +p268 +(lp269 +sS'compute.yaml' +p270 +(lp271 +(dp272 +Vaddresses +p273 +(lp274 +sVnetwork +p275 +VControlPlane +p276 +sVprimary +p277 +I01 +sVmtu +p278 +I1350 +sg72 +(lp279 +(dp280 +Vip_netmask +p281 +V0.0.0.0/0 +p282 +sVname +p283 +VRoute +p284 +sVdefault +p285 +I01 +sVnext_hop +p286 +V{get_param: ControlPlaneDefaultRoute} +p287 +sg72 +(lp288 +sVtype +p289 +Vroute +p290 +sasVroutes +p291 +(lp292 +sVuse_dhcp +p293 +I00 +sVtype +p294 +Vinterface +p295 +sVname +p296 +Vnic1 +p297 +sa(dp298 +Vaddresses +p299 +(lp300 +sVnetwork +p301 +VInternalApi +p302 +sVprimary +p303 +I01 +sVmtu +p304 +I1350 +sg72 +(lp305 +sVroutes +p306 +(lp307 +sVuse_dhcp +p308 +I00 +sVtype +p309 +Vinterface +p310 +sVname +p311 +Vnic3 +p312 +sa(dp313 +Vaddresses +p314 +(lp315 +sVnetwork +p316 +VStorage +p317 +sVprimary +p318 +I01 +sVmtu +p319 +I1350 +sg72 +(lp320 +sVroutes +p321 +(lp322 +sVuse_dhcp +p323 +I00 +sVtype +p324 +Vinterface +p325 +sVname +p326 +Vnic4 +p327 +sa(dp328 +Vdns_servers +p329 +V{get_param: DnsServers} +p330 +sVaddresses +p331 +(lp332 +sVnetwork +p333 +VTenant +p334 +sVmtu +p335 +I-1 +sg72 +(lp336 +(dp337 +Vaddresses +p338 +(lp339 +sVnetwork +p340 +VNone +p341 +sVprimary +p342 +I01 +sVmtu +p343 +I1350 +sg72 +(lp344 +sVroutes +p345 +(lp346 +sVuse_dhcp +p347 +I00 +sVtype +p348 +Vinterface +p349 +sVname +p350 +Vnic6 +p351 +sasVroutes +p352 +(lp353 +sVuse_dhcp +p354 +I00 +sVtype +p355 +Vovs_bridge +p356 +sVname p357 +Vbr-tenant +p358 sass. \ No newline at end of file diff --git a/overcloud-templates/network-templates-v2/nic-configs/ceph-storage.yaml b/overcloud-templates/network-templates-v2/nic-configs/ceph-storage.yaml index f9f5336..e7322e6 100644 --- a/overcloud-templates/network-templates-v2/nic-configs/ceph-storage.yaml +++ b/overcloud-templates/network-templates-v2/nic-configs/ceph-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/network-templates-v2/nic-configs/cinder-storage.yaml b/overcloud-templates/network-templates-v2/nic-configs/cinder-storage.yaml index 6010867..160cfca 100644 --- a/overcloud-templates/network-templates-v2/nic-configs/cinder-storage.yaml +++ b/overcloud-templates/network-templates-v2/nic-configs/cinder-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/network-templates-v2/nic-configs/compute.yaml b/overcloud-templates/network-templates-v2/nic-configs/compute.yaml index 181dce3..40b98b7 100644 --- a/overcloud-templates/network-templates-v2/nic-configs/compute.yaml +++ b/overcloud-templates/network-templates-v2/nic-configs/compute.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/network-templates-v2/nic-configs/controller.yaml b/overcloud-templates/network-templates-v2/nic-configs/controller.yaml index 4ebedda..bae7222 100644 --- a/overcloud-templates/network-templates-v2/nic-configs/controller.yaml +++ b/overcloud-templates/network-templates-v2/nic-configs/controller.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/network-templates-v2/nic-configs/swift-storage.yaml b/overcloud-templates/network-templates-v2/nic-configs/swift-storage.yaml index 6010867..160cfca 100644 --- a/overcloud-templates/network-templates-v2/nic-configs/swift-storage.yaml +++ b/overcloud-templates/network-templates-v2/nic-configs/swift-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/network-templates/nic-configs/ceph-storage.yaml b/overcloud-templates/network-templates/nic-configs/ceph-storage.yaml index a71f40a..574342a 100644 --- a/overcloud-templates/network-templates/nic-configs/ceph-storage.yaml +++ b/overcloud-templates/network-templates/nic-configs/ceph-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/network-templates/nic-configs/cinder-storage.yaml b/overcloud-templates/network-templates/nic-configs/cinder-storage.yaml index f16920d..9e9ae5b 100644 --- a/overcloud-templates/network-templates/nic-configs/cinder-storage.yaml +++ b/overcloud-templates/network-templates/nic-configs/cinder-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/network-templates/nic-configs/compute.yaml b/overcloud-templates/network-templates/nic-configs/compute.yaml index fa2d33f..129fe74 100644 --- a/overcloud-templates/network-templates/nic-configs/compute.yaml +++ b/overcloud-templates/network-templates/nic-configs/compute.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/network-templates/nic-configs/controller.yaml b/overcloud-templates/network-templates/nic-configs/controller.yaml index d56270d..8a33fea 100644 --- a/overcloud-templates/network-templates/nic-configs/controller.yaml +++ b/overcloud-templates/network-templates/nic-configs/controller.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/network-templates/nic-configs/swift-storage.yaml b/overcloud-templates/network-templates/nic-configs/swift-storage.yaml index f16920d..9e9ae5b 100644 --- a/overcloud-templates/network-templates/nic-configs/swift-storage.yaml +++ b/overcloud-templates/network-templates/nic-configs/swift-storage.yaml @@ -11,7 +11,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -19,7 +19,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' diff --git a/overcloud-templates/network-templates/ui-settings.pickle b/overcloud-templates/network-templates/ui-settings.pickle index 0b71d5c..a70c44a 100644 --- a/overcloud-templates/network-templates/ui-settings.pickle +++ b/overcloud-templates/network-templates/ui-settings.pickle @@ -66,576 +66,579 @@ sS'bond_options' p30 V p31 -sS'external' +sS'version' p32 -(dp33 +I1 +sS'external' +p33 +(dp34 S'bridge' -p34 -V'' p35 +V'' +p36 sg18 V10.0.0.50 -p36 +p37 sg17 I1 sg13 V10.0.0.10 -p37 +p38 sg15 V10.0.0.0/24 -p38 -sS'gateway' p39 -V10.0.0.1 +sS'gateway' p40 -ssS'internal_api' +V10.0.0.1 p41 -(dp42 +ssS'internal_api' +p42 +(dp43 g13 V172.17.0.10 -p43 +p44 sg15 V172.17.0.0/24 -p44 +p45 sg17 I2 sg18 V172.17.0.250 -p45 -ssS'ipv6' p46 +ssS'ipv6' +p47 I00 sS'storage_mgmt' -p47 -(dp48 +p48 +(dp49 g13 V172.19.0.10 -p49 +p50 sg15 V172.19.0.0/24 -p50 +p51 sg17 I4 sg18 V172.19.0.250 -p51 -ssS'minor' p52 +ssS'minor' +p53 I2 sS'tenant' -p53 -(dp54 +p54 +(dp55 g13 V172.16.0.10 -p55 +p56 sg15 V172.16.0.0/24 -p56 +p57 sg17 I5 sg18 V172.16.0.250 -p57 -sssS'data' p58 -(dp59 +sssS'data' +p59 +(dp60 S'cinder-storage.yaml' -p60 -(lp61 +p61 +(lp62 sS'ceph-storage.yaml' -p62 -(lp63 -(dp64 +p63 +(lp64 +(dp65 Vaddresses -p65 -(lp66 +p66 +(lp67 sVnetwork -p67 -VControlPlane p68 -sVprimary +VControlPlane p69 +sVprimary +p70 I01 sVmtu -p70 +p71 I1350 sS'members' -p71 -(lp72 +p72 +(lp73 sVroutes -p73 -(lp74 +p74 +(lp75 sVuse_dhcp -p75 -I00 -sVtype p76 -Vinterface +I00 +sVtype p77 -sVname +Vinterface p78 -Vnic1 +sVname p79 -sa(dp80 +Vnic1 +p80 +sa(dp81 Vaddresses -p81 -(lp82 +p82 +(lp83 sVnetwork -p83 -VStorage p84 -sVprimary +VStorage p85 -I01 -sVmtu +sVprimary p86 +I01 +sVmtu +p87 I1350 -sg71 -(lp87 +sg72 +(lp88 sVroutes -p88 -(lp89 +p89 +(lp90 sVuse_dhcp -p90 -I00 -sVtype p91 -Vinterface +I00 +sVtype p92 -sVname +Vinterface p93 -Vnic4 +sVname p94 -sa(dp95 +Vnic4 +p95 +sa(dp96 Vaddresses -p96 -(lp97 +p97 +(lp98 sVnetwork -p98 -VStorageMgmt p99 -sVprimary -p100 -I01 -sVmtu -p101 -I1350 -sg71 -(lp102 -sVroutes -p103 -(lp104 -sVuse_dhcp -p105 -I00 -sVtype -p106 -Vinterface -p107 -sVname -p108 -Vnic5 -p109 -sasS'controller.yaml' -p110 -(lp111 -(dp112 -Vaddresses -p113 -(lp114 -sVnetwork -p115 -VControlPlane -p116 -sVprimary -p117 -I01 -sVmtu -p118 -I1350 -sg71 -(lp119 -sVroutes -p120 -(lp121 -sVuse_dhcp -p122 -I00 -sVtype -p123 -Vinterface -p124 -sVname -p125 -Vnic1 -p126 -sa(dp127 -Vdns_servers -p128 -V{get_param: DnsServers} -p129 -sVaddresses -p130 -(lp131 -sVnetwork -p132 -VExternal -p133 -sVmtu -p134 -I-1 -sg71 -(lp135 -(dp136 -Vaddresses -p137 -(lp138 -sVnetwork -p139 -VNone -p140 -sVprimary -p141 -I01 -sVmtu -p142 -I1350 -sg71 -(lp143 -sVroutes -p144 -(lp145 -sVuse_dhcp -p146 -I00 -sVtype -p147 -Vinterface -p148 -sVname -p149 -Vnic2 -p150 -sasVroutes -p151 -(lp152 -sVuse_dhcp -p153 -I00 -sVtype -p154 -Vovs_bridge -p155 -sVname -p156 -Vbr-ex -p157 -sa(dp158 -Vaddresses -p159 -(lp160 -sVnetwork -p161 -VInternalApi -p162 -sVprimary -p163 -I01 -sVmtu -p164 -I1350 -sg71 -(lp165 -sVroutes -p166 -(lp167 -sVuse_dhcp -p168 -I00 -sVtype -p169 -Vinterface -p170 -sVname -p171 -Vnic3 -p172 -sa(dp173 -Vaddresses -p174 -(lp175 -sVnetwork -p176 -VStorage -p177 -sVprimary -p178 -I01 -sVmtu -p179 -I1350 -sg71 -(lp180 -sVroutes -p181 -(lp182 -sVuse_dhcp -p183 -I00 -sVtype -p184 -Vinterface -p185 -sVname -p186 -Vnic4 -p187 -sa(dp188 -Vaddresses -p189 -(lp190 -sVnetwork -p191 VStorageMgmt -p192 +p100 sVprimary -p193 +p101 I01 sVmtu -p194 +p102 I1350 -sg71 -(lp195 +sg72 +(lp103 sVroutes -p196 -(lp197 +p104 +(lp105 sVuse_dhcp -p198 +p106 I00 sVtype -p199 +p107 Vinterface -p200 +p108 sVname -p201 +p109 Vnic5 -p202 -sa(dp203 -Vdns_servers -p204 -V{get_param: DnsServers} -p205 -sVaddresses -p206 -(lp207 -sVnetwork -p208 -VTenant -p209 -sVmtu -p210 -I-1 -sg71 -(lp211 -(dp212 +p110 +sasS'controller.yaml' +p111 +(lp112 +(dp113 Vaddresses -p213 -(lp214 +p114 +(lp115 sVnetwork -p215 -VNone -p216 -sVprimary -p217 -I01 -sVmtu -p218 -I1350 -sg71 -(lp219 -sVroutes -p220 -(lp221 -sVuse_dhcp -p222 -I00 -sVtype -p223 -Vinterface -p224 -sVname -p225 -Vnic6 -p226 -sasVroutes -p227 -(lp228 -sVuse_dhcp -p229 -I00 -sVtype -p230 -Vovs_bridge -p231 -sVname -p232 -Vbr-tenant -p233 -sasS'swift-storage.yaml' -p234 -(lp235 -sS'compute.yaml' -p236 -(lp237 -(dp238 -Vaddresses -p239 -(lp240 -sVnetwork -p241 +p116 VControlPlane -p242 +p117 sVprimary -p243 +p118 I01 sVmtu -p244 +p119 I1350 -sg71 -(lp245 +sg72 +(lp120 sVroutes -p246 -(lp247 +p121 +(lp122 sVuse_dhcp -p248 +p123 I00 sVtype -p249 +p124 Vinterface -p250 +p125 sVname -p251 +p126 Vnic1 -p252 -sa(dp253 -Vaddresses -p254 -(lp255 -sVnetwork -p256 -VInternalApi -p257 -sVprimary -p258 -I01 -sVmtu -p259 -I1350 -sg71 -(lp260 -sVroutes -p261 -(lp262 -sVuse_dhcp -p263 -I00 -sVtype -p264 -Vinterface -p265 -sVname -p266 -Vnic3 -p267 -sa(dp268 -Vaddresses -p269 -(lp270 -sVnetwork -p271 -VStorage -p272 -sVprimary -p273 -I01 -sVmtu -p274 -I1350 -sg71 -(lp275 -sVroutes -p276 -(lp277 -sVuse_dhcp -p278 -I00 -sVtype -p279 -Vinterface -p280 -sVname -p281 -Vnic4 -p282 -sa(dp283 +p127 +sa(dp128 Vdns_servers -p284 +p129 V{get_param: DnsServers} -p285 +p130 sVaddresses -p286 -(lp287 +p131 +(lp132 sVnetwork -p288 -VTenant -p289 +p133 +VExternal +p134 sVmtu -p290 +p135 I-1 -sg71 -(lp291 -(dp292 +sg72 +(lp136 +(dp137 Vaddresses -p293 -(lp294 +p138 +(lp139 sVnetwork -p295 +p140 VNone -p296 +p141 sVprimary -p297 +p142 I01 sVmtu -p298 +p143 I1350 -sg71 -(lp299 +sg72 +(lp144 sVroutes -p300 -(lp301 +p145 +(lp146 sVuse_dhcp -p302 +p147 I00 sVtype -p303 +p148 Vinterface -p304 +p149 sVname -p305 -Vnic6 -p306 +p150 +Vnic2 +p151 sasVroutes -p307 -(lp308 +p152 +(lp153 sVuse_dhcp -p309 +p154 I00 sVtype -p310 +p155 Vovs_bridge -p311 +p156 sVname -p312 +p157 +Vbr-ex +p158 +sa(dp159 +Vaddresses +p160 +(lp161 +sVnetwork +p162 +VInternalApi +p163 +sVprimary +p164 +I01 +sVmtu +p165 +I1350 +sg72 +(lp166 +sVroutes +p167 +(lp168 +sVuse_dhcp +p169 +I00 +sVtype +p170 +Vinterface +p171 +sVname +p172 +Vnic3 +p173 +sa(dp174 +Vaddresses +p175 +(lp176 +sVnetwork +p177 +VStorage +p178 +sVprimary +p179 +I01 +sVmtu +p180 +I1350 +sg72 +(lp181 +sVroutes +p182 +(lp183 +sVuse_dhcp +p184 +I00 +sVtype +p185 +Vinterface +p186 +sVname +p187 +Vnic4 +p188 +sa(dp189 +Vaddresses +p190 +(lp191 +sVnetwork +p192 +VStorageMgmt +p193 +sVprimary +p194 +I01 +sVmtu +p195 +I1350 +sg72 +(lp196 +sVroutes +p197 +(lp198 +sVuse_dhcp +p199 +I00 +sVtype +p200 +Vinterface +p201 +sVname +p202 +Vnic5 +p203 +sa(dp204 +Vdns_servers +p205 +V{get_param: DnsServers} +p206 +sVaddresses +p207 +(lp208 +sVnetwork +p209 +VTenant +p210 +sVmtu +p211 +I-1 +sg72 +(lp212 +(dp213 +Vaddresses +p214 +(lp215 +sVnetwork +p216 +VNone +p217 +sVprimary +p218 +I01 +sVmtu +p219 +I1350 +sg72 +(lp220 +sVroutes +p221 +(lp222 +sVuse_dhcp +p223 +I00 +sVtype +p224 +Vinterface +p225 +sVname +p226 +Vnic6 +p227 +sasVroutes +p228 +(lp229 +sVuse_dhcp +p230 +I00 +sVtype +p231 +Vovs_bridge +p232 +sVname +p233 Vbr-tenant +p234 +sasS'swift-storage.yaml' +p235 +(lp236 +sS'compute.yaml' +p237 +(lp238 +(dp239 +Vaddresses +p240 +(lp241 +sVnetwork +p242 +VControlPlane +p243 +sVprimary +p244 +I01 +sVmtu +p245 +I1350 +sg72 +(lp246 +sVroutes +p247 +(lp248 +sVuse_dhcp +p249 +I00 +sVtype +p250 +Vinterface +p251 +sVname +p252 +Vnic1 +p253 +sa(dp254 +Vaddresses +p255 +(lp256 +sVnetwork +p257 +VInternalApi +p258 +sVprimary +p259 +I01 +sVmtu +p260 +I1350 +sg72 +(lp261 +sVroutes +p262 +(lp263 +sVuse_dhcp +p264 +I00 +sVtype +p265 +Vinterface +p266 +sVname +p267 +Vnic3 +p268 +sa(dp269 +Vaddresses +p270 +(lp271 +sVnetwork +p272 +VStorage +p273 +sVprimary +p274 +I01 +sVmtu +p275 +I1350 +sg72 +(lp276 +sVroutes +p277 +(lp278 +sVuse_dhcp +p279 +I00 +sVtype +p280 +Vinterface +p281 +sVname +p282 +Vnic4 +p283 +sa(dp284 +Vdns_servers +p285 +V{get_param: DnsServers} +p286 +sVaddresses +p287 +(lp288 +sVnetwork +p289 +VTenant +p290 +sVmtu +p291 +I-1 +sg72 +(lp292 +(dp293 +Vaddresses +p294 +(lp295 +sVnetwork +p296 +VNone +p297 +sVprimary +p298 +I01 +sVmtu +p299 +I1350 +sg72 +(lp300 +sVroutes +p301 +(lp302 +sVuse_dhcp +p303 +I00 +sVtype +p304 +Vinterface +p305 +sVname +p306 +Vnic6 +p307 +sasVroutes +p308 +(lp309 +sVuse_dhcp +p310 +I00 +sVtype +p311 +Vovs_bridge +p312 +sVname p313 +Vbr-tenant +p314 sass. \ No newline at end of file