openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix networking settings for ObjectStorage role"

Browse Source
This commit is contained in:
Zuul 2017-10-28 05:58:39 +00:00 committed by Gerrit Code Review
commit 64656852bf
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
environments/ips-from-pool-all.yaml
View File

@ -22,12 +22,12 @@ resource_registry:
OS::TripleO::CephStorage::Ports::TenantPort: ../network/ports/noop.yaml OS::TripleO::CephStorage::Ports::TenantPort: ../network/ports/noop.yaml
#OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml #OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
OS::TripleO::SwiftStorage::Ports::ExternalPort: ../network/ports/noop.yaml OS::TripleO::ObjectStorage::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml OS::TripleO::ObjectStorage::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage_from_pool.yaml OS::TripleO::ObjectStorage::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml OS::TripleO::ObjectStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
OS::TripleO::SwiftStorage::Ports::TenantPort: ../network/ports/noop.yaml OS::TripleO::ObjectStorage::Ports::TenantPort: ../network/ports/noop.yaml
#OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml #OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
OS::TripleO::BlockStorage::Ports::ExternalPort: ../network/ports/noop.yaml OS::TripleO::BlockStorage::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::BlockStorage::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml OS::TripleO::BlockStorage::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml

2
environments/network-management-v6.yaml
View File

@ -23,7 +23,7 @@ resource_registry:
OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management_v6.yaml OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management_v6.yaml
# Port assignments for the swift storage role # Port assignments for the swift storage role
OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management_v6.yaml OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management_v6.yaml
# Port assignments for the block storage role # Port assignments for the block storage role
OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management_v6.yaml OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management_v6.yaml

2
environments/network-management.yaml
View File

@ -23,7 +23,7 @@ resource_registry:
OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
# Port assignments for the swift storage role # Port assignments for the swift storage role
OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
# Port assignments for the block storage role # Port assignments for the block storage role
OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml

2
network/config/bond-with-vlans/README.md
View File

@ -41,7 +41,7 @@ that looks something like this:
OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml
Or use this Heat environment file: Or use this Heat environment file:

2
network/config/multiple-nics/README.md
View File

@ -31,7 +31,7 @@ that looks something like this:
OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml
Or use this Heat environment file: Or use this Heat environment file:

2
network/config/single-nic-vlans/README.md
View File

@ -41,7 +41,7 @@ that looks something like this:
OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml
Or use this Heat environment file: Or use this Heat environment file:

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -31,7 +31,7 @@ resource_registry:
{%- else %} {%- else %}
# Note we have to special-case ObjectStorage for backwards compatibility # Note we have to special-case ObjectStorage for backwards compatibility
{%- for network in networks %} {%- for network in networks %}
OS::TripleO::SwiftStorage::Ports::{{network.name}}Port: network/ports/noop.yaml OS::TripleO::ObjectStorage::Ports::{{network.name}}Port: network/ports/noop.yaml
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml