diff --git a/bond-network-templates/README b/bond-network-templates/README index 5d35c2a..189bfb5 100644 --- a/bond-network-templates/README +++ b/bond-network-templates/README @@ -13,10 +13,11 @@ tripleo-heat-templates, so by default the tool generates the paths assuming network-isolation.yaml will be copied into the environments/ directory of tripleo-heat-templates. -If these templates are at ~/generated-templates and a local copy of -tripleo-heat-templates (it is not recommended to make changes to the packaged -tripleo-heat-templates tree) is at ~/tht, then an example deployment would -look like this: +If the standard tripleo-heat-templates are in use, then the +network-isolation-absolute.yaml file can be used instead. It has hard-coded +references to the port files in /usr/share/openstack-tripleo-heat-templates. -cp ~/generated-templates/network-isolation.yaml ~/tht/environments/generated-network-isolation.yaml -openstack overcloud deploy --templates ~/tht -e ~/tht/environments/generated-network-isolation.yaml -e ~/generated-templates/network-environment.yaml +If the generated network isolation templates are at ~/generated-templates, an +example deployment command would look like: + +openstack overcloud deploy --templates -e ~/generated-templates/network-isolation-absolute.yaml -e ~/generated-templates/network-environment.yaml diff --git a/bond-network-templates/network-isolation-absolute.yaml b/bond-network-templates/network-isolation-absolute.yaml new file mode 100644 index 0000000..9843359 --- /dev/null +++ b/bond-network-templates/network-isolation-absolute.yaml @@ -0,0 +1,29 @@ +resource_registry: + # Redis + OS::TripleO::Network::Ports::RedisVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/vip.yaml + OS::TripleO::Controller::Ports::RedisVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/vip.yaml + # External + OS::TripleO::Network::External: /usr/share/openstack-tripleo-heat-templates/network/external.yaml + OS::TripleO::Network::Ports::ExternalVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml + OS::TripleO::Controller::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml + # InternalApi + OS::TripleO::Network::InternalApi: /usr/share/openstack-tripleo-heat-templates/network/internal_api.yaml + OS::TripleO::Network::Ports::InternalApiVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api.yaml + OS::TripleO::Controller::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api.yaml + OS::TripleO::Compute::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api.yaml + # Storage + OS::TripleO::Network::Storage: /usr/share/openstack-tripleo-heat-templates/network/storage.yaml + OS::TripleO::Network::Ports::StorageVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml + OS::TripleO::Controller::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml + OS::TripleO::Compute::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml + OS::TripleO::CephStorage::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml + # StorageMgmt + 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::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 + OS::TripleO::Network::Ports::TenantVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml + OS::TripleO::Controller::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml + OS::TripleO::Compute::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml diff --git a/ipv6-network-templates/README b/ipv6-network-templates/README index 5d35c2a..189bfb5 100644 --- a/ipv6-network-templates/README +++ b/ipv6-network-templates/README @@ -13,10 +13,11 @@ tripleo-heat-templates, so by default the tool generates the paths assuming network-isolation.yaml will be copied into the environments/ directory of tripleo-heat-templates. -If these templates are at ~/generated-templates and a local copy of -tripleo-heat-templates (it is not recommended to make changes to the packaged -tripleo-heat-templates tree) is at ~/tht, then an example deployment would -look like this: +If the standard tripleo-heat-templates are in use, then the +network-isolation-absolute.yaml file can be used instead. It has hard-coded +references to the port files in /usr/share/openstack-tripleo-heat-templates. -cp ~/generated-templates/network-isolation.yaml ~/tht/environments/generated-network-isolation.yaml -openstack overcloud deploy --templates ~/tht -e ~/tht/environments/generated-network-isolation.yaml -e ~/generated-templates/network-environment.yaml +If the generated network isolation templates are at ~/generated-templates, an +example deployment command would look like: + +openstack overcloud deploy --templates -e ~/generated-templates/network-isolation-absolute.yaml -e ~/generated-templates/network-environment.yaml diff --git a/ipv6-network-templates/network-isolation-absolute.yaml b/ipv6-network-templates/network-isolation-absolute.yaml new file mode 100644 index 0000000..bba5195 --- /dev/null +++ b/ipv6-network-templates/network-isolation-absolute.yaml @@ -0,0 +1,36 @@ +resource_registry: + # Redis + OS::TripleO::Network::Ports::RedisVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/vip_v6.yaml + OS::TripleO::Controller::Ports::RedisVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/vip_v6.yaml + # External + OS::TripleO::Network::External: /usr/share/openstack-tripleo-heat-templates/network/external_v6.yaml + OS::TripleO::Network::Ports::ExternalVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external_v6.yaml + OS::TripleO::Controller::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external_v6.yaml + # InternalApi + OS::TripleO::Network::InternalApi: /usr/share/openstack-tripleo-heat-templates/network/internal_api_v6.yaml + OS::TripleO::Network::Ports::InternalApiVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api_v6.yaml + OS::TripleO::Controller::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api_v6.yaml + OS::TripleO::Compute::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api_v6.yaml + # Storage + OS::TripleO::Network::Storage: /usr/share/openstack-tripleo-heat-templates/network/storage_v6.yaml + OS::TripleO::Network::Ports::StorageVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_v6.yaml + OS::TripleO::Controller::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_v6.yaml + OS::TripleO::Compute::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_v6.yaml + OS::TripleO::CephStorage::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_v6.yaml + # StorageMgmt + OS::TripleO::Network::StorageMgmt: /usr/share/openstack-tripleo-heat-templates/network/storage_mgmt_v6.yaml + OS::TripleO::Network::Ports::StorageMgmtVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt_v6.yaml + OS::TripleO::Controller::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt_v6.yaml + OS::TripleO::CephStorage::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage_mgmt_v6.yaml + # Tenant + OS::TripleO::Network::Tenant: /usr/share/openstack-tripleo-heat-templates/network/tenant.yaml + OS::TripleO::Network::Ports::TenantVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml + OS::TripleO::Controller::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml + OS::TripleO::Compute::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml +parameter_defaults: + CephIPv6: True + CorosyncIPv6: True + MongoDbIPv6: True + NovaIPv6: True + RabbitIPv6: True + MemcachedIPv6: True diff --git a/network-templates/README b/network-templates/README index 5d35c2a..189bfb5 100644 --- a/network-templates/README +++ b/network-templates/README @@ -13,10 +13,11 @@ tripleo-heat-templates, so by default the tool generates the paths assuming network-isolation.yaml will be copied into the environments/ directory of tripleo-heat-templates. -If these templates are at ~/generated-templates and a local copy of -tripleo-heat-templates (it is not recommended to make changes to the packaged -tripleo-heat-templates tree) is at ~/tht, then an example deployment would -look like this: +If the standard tripleo-heat-templates are in use, then the +network-isolation-absolute.yaml file can be used instead. It has hard-coded +references to the port files in /usr/share/openstack-tripleo-heat-templates. -cp ~/generated-templates/network-isolation.yaml ~/tht/environments/generated-network-isolation.yaml -openstack overcloud deploy --templates ~/tht -e ~/tht/environments/generated-network-isolation.yaml -e ~/generated-templates/network-environment.yaml +If the generated network isolation templates are at ~/generated-templates, an +example deployment command would look like: + +openstack overcloud deploy --templates -e ~/generated-templates/network-isolation-absolute.yaml -e ~/generated-templates/network-environment.yaml diff --git a/network-templates/network-isolation-absolute.yaml b/network-templates/network-isolation-absolute.yaml new file mode 100644 index 0000000..9843359 --- /dev/null +++ b/network-templates/network-isolation-absolute.yaml @@ -0,0 +1,29 @@ +resource_registry: + # Redis + OS::TripleO::Network::Ports::RedisVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/vip.yaml + OS::TripleO::Controller::Ports::RedisVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/vip.yaml + # External + OS::TripleO::Network::External: /usr/share/openstack-tripleo-heat-templates/network/external.yaml + OS::TripleO::Network::Ports::ExternalVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml + OS::TripleO::Controller::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml + # InternalApi + OS::TripleO::Network::InternalApi: /usr/share/openstack-tripleo-heat-templates/network/internal_api.yaml + OS::TripleO::Network::Ports::InternalApiVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api.yaml + OS::TripleO::Controller::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api.yaml + OS::TripleO::Compute::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/internal_api.yaml + # Storage + OS::TripleO::Network::Storage: /usr/share/openstack-tripleo-heat-templates/network/storage.yaml + OS::TripleO::Network::Ports::StorageVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml + OS::TripleO::Controller::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml + OS::TripleO::Compute::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml + OS::TripleO::CephStorage::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/storage.yaml + # StorageMgmt + 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::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 + OS::TripleO::Network::Ports::TenantVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml + OS::TripleO::Controller::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml + OS::TripleO::Compute::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/tenant.yaml