openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Add storage-mgmt network to compute nodes"

This commit is contained in:
Jenkins 2017-04-19 17:12:56 +00:00 committed by Gerrit Code Review
parent 11cb5663a9 069c165e02
commit 5e6395a1db
5 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test-environments/ips-from-pool-all.yaml
View File

@ -8,7 +8,7 @@ resource_registry:
OS::TripleO::Compute::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml
OS::TripleO::Compute::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api_from_pool.yaml
OS::TripleO::Compute::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_from_pool.yaml
OS::TripleO::Compute::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml
OS::TripleO::Compute::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt_from_pool.yaml
OS::TripleO::Compute::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant_from_pool.yaml
OS::TripleO::CephStorage::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml
@ -72,6 +72,8 @@ parameter_defaults:
- 172.17.0.249
storage:
- 172.18.0.249
storage_mgmt:
- 172.19.0.249
tenant:
- 172.16.0.249
CephStorageIPs:

1
test-environments/network-templates/network-isolation-absolute.yaml
View File

@ -20,6 +20,7 @@ resource_registry:
OS::TripleO::Network::StorageMgmt: /usr/share/openstack-tripleo-heat-templates/network/storage_mgmt.yaml
OS::TripleO::Network::Ports::StorageMgmtVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
OS::TripleO::Controller::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
OS::TripleO::Compute::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
OS::TripleO::CephStorage::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt.yaml
# Tenant
OS::TripleO::Network::Tenant: /usr/share/openstack-tripleo-heat-templates/network/tenant.yaml

1
test-environments/network-templates/network-isolation.yaml
View File

@ -20,6 +20,7 @@ resource_registry:
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::Compute::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

6
test-environments/network-templates/nic-configs/compute.yaml
View File

@ -121,6 +121,12 @@ resources:
name: nic6
mtu: 1350
primary: true
- type: interface
name: nic5
mtu: 1350
use_dhcp: false
addresses:
- ip_netmask: {get_param: StorageMgmtIpSubnet}
group: os-apply-config
type: OS::Heat::StructuredConfig

30
test-environments/network-templates/ui-settings.pickle
View File

@ -638,4 +638,34 @@ sVname
p312
Vbr-tenant
p313
sa(dp314
Vaddresses
p315
(lp316
sVnetwork
p317
VStorageMgmt
p318
sVprimary
p319
I01
sVmtu
p320
I1350
sg71
(lp321
sVroutes
p322
(lp323
sVuse_dhcp
p324
I00
sVtype
p325
Vinterface
p326
sVname
p327
Vnic5
p328
sass.