Add ceph net-iso configuration

The network templates did not configure Ceph, which causes ceph deployments in OVB to fail.
2016-08-04 11:37:42 -05:00 · 2016-08-04 11:37:42 -05:00 · 9d466b052e
commit 9d466b052e
parent 24c3d8f86d
4 changed files with 433 additions and 314 deletions
--- a/network-templates/network-isolation.yaml
+++ b/network-templates/network-isolation.yaml
@ -16,10 +16,12 @@ resource_registry:
  OS::TripleO::Network::Ports::StorageVipPort: ../network/ports/storage.yaml
  OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage.yaml
  OS::TripleO::Compute::Ports::StoragePort: ../network/ports/storage.yaml
+  OS::TripleO::CephStorage::Ports::StoragePort: ../network/ports/storage.yaml
  # StorageMgmt
  OS::TripleO::Network::StorageMgmt: ../network/storage_mgmt.yaml
  OS::TripleO::Network::Ports::StorageMgmtVipPort: ../network/ports/storage_mgmt.yaml
  OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
+  OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
  # Tenant
  OS::TripleO::Network::Tenant: ../network/tenant.yaml
  OS::TripleO::Network::Ports::TenantVipPort: ../network/ports/tenant.yaml
--- a/network-templates/nic-configs/ceph-storage.yaml
+++ b/network-templates/nic-configs/ceph-storage.yaml
@ -82,7 +82,34 @@ resources:
    properties:
      config:
        os_net_config:
-          network_config: []
+          network_config:
+          - addresses:
+            - ip_netmask:
+                list_join:
+                - /
+                - - {get_param: ControlPlaneIp}
+                  - {get_param: ControlPlaneSubnetCidr}
+            mtu: 1350
+            name: nic1
+            routes:
+            - ip_netmask: 169.254.169.254/32
+              next_hop: {get_param: EC2MetadataIp}
+            - default: true
+              next_hop: {get_param: ControlPlaneDefaultRoute}
+            type: interface
+            use_dhcp: false
+          - addresses:
+            - ip_netmask: {get_param: StorageIpSubnet}
+            mtu: 1350
+            name: nic4
+            type: interface
+            use_dhcp: false
+          - addresses:
+            - ip_netmask: {get_param: StorageMgmtIpSubnet}
+            mtu: 1350
+            name: nic5
+            type: interface
+            use_dhcp: false
      group: os-apply-config
    type: OS::Heat::StructuredConfig

--- a/network-templates/nic-configs/compute.yaml
+++ b/network-templates/nic-configs/compute.yaml
@ -114,10 +114,10 @@ resources:
            - ip_netmask: {get_param: TenantIpSubnet}
            dns_servers: {get_param: DnsServers}
            members:
-            - name: nic6
+            - mtu: 1350
+              name: nic6
              primary: true
              type: interface
-            mtu: 1350
            name: br-tenant
            type: ovs_bridge
            use_dhcp: false
--- a/network-templates/ui-settings.pickle
+++ b/network-templates/ui-settings.pickle
@ -139,178 +139,178 @@ p58
 sS'ceph-storage.yaml'
 p60
 (lp61
-sS'controller.yaml'
-p62
-(lp63
-(dp64
+(dp62
 Vaddresses
-p65
-(lp66
+p63
+(lp64
 sVnetwork
-p67
+p65
 VControlPlane
-p68
+p66
 sVprimary
-p69
+p67
 I01
 sVmtu
-p70
-I1400
+p68
+I1350
 sS'members'
+p69
+(lp70
+sVroutes
 p71
 (lp72
-sVroutes
+sVuse_dhcp
 p73
-(lp74
-sVuse_dhcp
+I00
+sVtype
+p74
+Vinterface
 p75
-I00
-sVtype
+sVname
 p76
-Vinterface
-p77
-sVname
-p78
 Vnic1
+p77
+sa(dp78
+Vaddresses
 p79
-sa(dp80
-Vdns_servers
+(lp80
+sVnetwork
 p81
-V{get_param: DnsServers}
-p82
-sVaddresses
-p83
-(lp84
-sVnetwork
-p85
-VExternal
-p86
-sVmtu
-p87
-I-1
-sg71
-(lp88
-(dp89
-Vaddresses
-p90
-(lp91
-sVnetwork
-p92
-VNone
-p93
-sVprimary
-p94
-I01
-sVmtu
-p95
-I1400
-sg71
-(lp96
-sVroutes
-p97
-(lp98
-sVuse_dhcp
-p99
-I00
-sVtype
-p100
-Vinterface
-p101
-sVname
-p102
-Vnic2
-p103
-sasVroutes
-p104
-(lp105
-sVuse_dhcp
-p106
-I00
-sVtype
-p107
-Vovs_bridge
-p108
-sVname
-p109
-Vbr-ex
-p110
-sa(dp111
-Vaddresses
-p112
-(lp113
-sVnetwork
-p114
-VInternalApi
-p115
-sVprimary
-p116
-I01
-sVmtu
-p117
-I1400
-sg71
-(lp118
-sVroutes
-p119
-(lp120
-sVuse_dhcp
-p121
-I00
-sVtype
-p122
-Vinterface
-p123
-sVname
-p124
-Vnic3
-p125
-sa(dp126
-Vaddresses
-p127
-(lp128
-sVnetwork
-p129
 VStorage
-p130
+p82
 sVprimary
-p131
+p83
 I01
 sVmtu
+p84
+I1350
+sg69
+(lp85
+sVroutes
+p86
+(lp87
+sVuse_dhcp
+p88
+I00
+sVtype
+p89
+Vinterface
+p90
+sVname
+p91
+Vnic4
+p92
+sa(dp93
+Vaddresses
+p94
+(lp95
+sVnetwork
+p96
+VStorageMgmt
+p97
+sVprimary
+p98
+I01
+sVmtu
+p99
+I1350
+sg69
+(lp100
+sVroutes
+p101
+(lp102
+sVuse_dhcp
+p103
+I00
+sVtype
+p104
+Vinterface
+p105
+sVname
+p106
+Vnic5
+p107
+sasS'controller.yaml'
+p108
+(lp109
+(dp110
+Vaddresses
+p111
+(lp112
+sVnetwork
+p113
+VControlPlane
+p114
+sVprimary
+p115
+I01
+sVmtu
+p116
+I1350
+sg69
+(lp117
+sVroutes
+p118
+(lp119
+sVuse_dhcp
+p120
+I00
+sVtype
+p121
+Vinterface
+p122
+sVname
+p123
+Vnic1
+p124
+sa(dp125
+Vdns_servers
+p126
+V{get_param: DnsServers}
+p127
+sVaddresses
+p128
+(lp129
+sVnetwork
+p130
+VExternal
+p131
+sVmtu
 p132
-I1400
-sg71
+I-1
+sg69
 (lp133
-sVroutes
-p134
-(lp135
-sVuse_dhcp
-p136
-I00
-sVtype
-p137
-Vinterface
-p138
-sVname
-p139
-Vnic4
-p140
-sa(dp141
+(dp134
 Vaddresses
-p142
-(lp143
+p135
+(lp136
 sVnetwork
-p144
-VStorageMgmt
-p145
+p137
+VNone
+p138
 sVprimary
-p146
+p139
 I01
 sVmtu
-p147
-I1400
-sg71
-(lp148
+p140
+I1350
+sg69
+(lp141
 sVroutes
+p142
+(lp143
+sVuse_dhcp
+p144
+I00
+sVtype
+p145
+Vinterface
+p146
+sVname
+p147
+Vnic2
+p148
+sasVroutes
 p149
 (lp150
 sVuse_dhcp
@ -318,228 +318,318 @@ p151
 I00
 sVtype
 p152
-Vinterface
+Vovs_bridge
 p153
 sVname
 p154
-Vnic5
+Vbr-ex
 p155
 sa(dp156
-Vdns_servers
-p157
-V{get_param: DnsServers}
-p158
-sVaddresses
-p159
-(lp160
-sVnetwork
-p161
-VTenant
-p162
-sVmtu
-p163
-I-1
-sg71
-(lp164
-(dp165
 Vaddresses
-p166
-(lp167
+p157
+(lp158
 sVnetwork
-p168
-VNone
-p169
+p159
+VInternalApi
+p160
 sVprimary
-p170
+p161
 I01
 sVmtu
-p171
-I1400
-sg71
-(lp172
+p162
+I1350
+sg69
+(lp163
 sVroutes
-p173
-(lp174
+p164
+(lp165
 sVuse_dhcp
-p175
+p166
 I00
 sVtype
-p176
+p167
 Vinterface
-p177
+p168
 sVname
-p178
-Vnic6
+p169
+Vnic3
+p170
+sa(dp171
+Vaddresses
+p172
+(lp173
+sVnetwork
+p174
+VStorage
+p175
+sVprimary
+p176
+I01
+sVmtu
+p177
+I1350
+sg69
+(lp178
+sVroutes
 p179
-sasVroutes
-p180
-(lp181
+(lp180
 sVuse_dhcp
-p182
+p181
 I00
 sVtype
+p182
+Vinterface
 p183
-Vovs_bridge
-p184
 sVname
+p184
+Vnic4
 p185
-Vbr-tenant
-p186
-sasS'swift-storage.yaml'
+sa(dp186
+Vaddresses
 p187
 (lp188
-sS'compute.yaml'
+sVnetwork
 p189
-(lp190
-(dp191
-Vaddresses
+VStorageMgmt
+p190
+sVprimary
+p191
+I01
+sVmtu
 p192
+I1350
+sg69
 (lp193
-sVnetwork
+sVroutes
 p194
-VControlPlane
-p195
-sVprimary
+(lp195
+sVuse_dhcp
 p196
-I01
-sVmtu
+I00
+sVtype
 p197
-I1400
-sg71
-(lp198
-sVroutes
+Vinterface
+p198
+sVname
 p199
-(lp200
-sVuse_dhcp
-p201
-I00
-sVtype
-p202
-Vinterface
-p203
-sVname
-p204
-Vnic1
-p205
-sa(dp206
-Vaddresses
-p207
-(lp208
-sVnetwork
-p209
-VInternalApi
-p210
-sVprimary
-p211
-I01
-sVmtu
-p212
-I1400
-sg71
-(lp213
-sVroutes
-p214
-(lp215
-sVuse_dhcp
-p216
-I00
-sVtype
-p217
-Vinterface
-p218
-sVname
-p219
-Vnic3
-p220
-sa(dp221
-Vaddresses
-p222
-(lp223
-sVnetwork
-p224
-VStorage
-p225
-sVprimary
-p226
-I01
-sVmtu
-p227
-I1400
-sg71
-(lp228
-sVroutes
-p229
-(lp230
-sVuse_dhcp
-p231
-I00
-sVtype
-p232
-Vinterface
-p233
-sVname
-p234
-Vnic4
-p235
-sa(dp236
+Vnic5
+p200
+sa(dp201
 Vdns_servers
-p237
+p202
 V{get_param: DnsServers}
-p238
+p203
 sVaddresses
-p239
-(lp240
+p204
+(lp205
 sVnetwork
-p241
+p206
 VTenant
-p242
+p207
 sVmtu
-p243
-I1400
-sg71
-(lp244
-(dp245
+p208
+I-1
+sg69
+(lp209
+(dp210
 Vaddresses
-p246
-(lp247
+p211
+(lp212
 sVnetwork
-p248
+p213
 VNone
-p249
+p214
 sVprimary
-p250
+p215
 I01
 sVmtu
-p251
-I-1
-sg71
-(lp252
+p216
+I1350
+sg69
+(lp217
 sVroutes
-p253
-(lp254
+p218
+(lp219
 sVuse_dhcp
-p255
+p220
 I00
 sVtype
-p256
+p221
 Vinterface
-p257
+p222
 sVname
-p258
+p223
 Vnic6
-p259
+p224
 sasVroutes
-p260
-(lp261
+p225
+(lp226
 sVuse_dhcp
-p262
+p227
 I00
 sVtype
-p263
+p228
 Vovs_bridge
-p264
+p229
 sVname
-p265
+p230
 Vbr-tenant
-p266
+p231
+sasS'swift-storage.yaml'
+p232
+(lp233
+sS'compute.yaml'
+p234
+(lp235
+(dp236
+Vaddresses
+p237
+(lp238
+sVnetwork
+p239
+VControlPlane
+p240
+sVprimary
+p241
+I01
+sVmtu
+p242
+I1350
+sg69
+(lp243
+sVroutes
+p244
+(lp245
+sVuse_dhcp
+p246
+I00
+sVtype
+p247
+Vinterface
+p248
+sVname
+p249
+Vnic1
+p250
+sa(dp251
+Vaddresses
+p252
+(lp253
+sVnetwork
+p254
+VInternalApi
+p255
+sVprimary
+p256
+I01
+sVmtu
+p257
+I1350
+sg69
+(lp258
+sVroutes
+p259
+(lp260
+sVuse_dhcp
+p261
+I00
+sVtype
+p262
+Vinterface
+p263
+sVname
+p264
+Vnic3
+p265
+sa(dp266
+Vaddresses
+p267
+(lp268
+sVnetwork
+p269
+VStorage
+p270
+sVprimary
+p271
+I01
+sVmtu
+p272
+I1350
+sg69
+(lp273
+sVroutes
+p274
+(lp275
+sVuse_dhcp
+p276
+I00
+sVtype
+p277
+Vinterface
+p278
+sVname
+p279
+Vnic4
+p280
+sa(dp281
+Vdns_servers
+p282
+V{get_param: DnsServers}
+p283
+sVaddresses
+p284
+(lp285
+sVnetwork
+p286
+VTenant
+p287
+sVmtu
+p288
+I-1
+sg69
+(lp289
+(dp290
+Vaddresses
+p291
+(lp292
+sVnetwork
+p293
+VNone
+p294
+sVprimary
+p295
+I01
+sVmtu
+p296
+I1350
+sg69
+(lp297
+sVroutes
+p298
+(lp299
+sVuse_dhcp
+p300
+I00
+sVtype
+p301
+Vinterface
+p302
+sVname
+p303
+Vnic6
+p304
+sasVroutes
+p305
+(lp306
+sVuse_dhcp
+p307
+I00
+sVtype
+p308
+Vovs_bridge
+p309
+sVname
+p310
+Vbr-tenant
+p311
 sass.