Merge "Fix network-isolation.yaml relative paths for ci"
This commit is contained in:
commit
45d6ce722e
ci/environments/network
multiple-nics-ipv6
multiple-nics
public-bond
@ -1,31 +1,31 @@
|
|||||||
resource_registry:
|
resource_registry:
|
||||||
# Redis
|
# Redis
|
||||||
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip_v6.yaml
|
OS::TripleO::Network::Ports::RedisVipPort: ../../../../network/ports/vip_v6.yaml
|
||||||
# External
|
# External
|
||||||
OS::TripleO::Network::External: ../network/external_v6.yaml
|
OS::TripleO::Network::External: ../../../../network/external_v6.yaml
|
||||||
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_v6.yaml
|
OS::TripleO::Network::Ports::ExternalVipPort: ../../../../network/ports/external_v6.yaml
|
||||||
OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external_v6.yaml
|
OS::TripleO::Controller::Ports::ExternalPort: ../../../../network/ports/external_v6.yaml
|
||||||
# InternalApi
|
# InternalApi
|
||||||
OS::TripleO::Network::InternalApi: ../network/internal_api_v6.yaml
|
OS::TripleO::Network::InternalApi: ../../../../network/internal_api_v6.yaml
|
||||||
OS::TripleO::Network::Ports::InternalApiVipPort: ../network/ports/internal_api_v6.yaml
|
OS::TripleO::Network::Ports::InternalApiVipPort: ../../../../network/ports/internal_api_v6.yaml
|
||||||
OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
|
OS::TripleO::Controller::Ports::InternalApiPort: ../../../../network/ports/internal_api_v6.yaml
|
||||||
OS::TripleO::Compute::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
|
OS::TripleO::Compute::Ports::InternalApiPort: ../../../../network/ports/internal_api_v6.yaml
|
||||||
# Storage
|
# Storage
|
||||||
OS::TripleO::Network::Storage: ../network/storage_v6.yaml
|
OS::TripleO::Network::Storage: ../../../../network/storage_v6.yaml
|
||||||
OS::TripleO::Network::Ports::StorageVipPort: ../network/ports/storage_v6.yaml
|
OS::TripleO::Network::Ports::StorageVipPort: ../../../../network/ports/storage_v6.yaml
|
||||||
OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage_v6.yaml
|
OS::TripleO::Controller::Ports::StoragePort: ../../../../network/ports/storage_v6.yaml
|
||||||
OS::TripleO::Compute::Ports::StoragePort: ../network/ports/storage_v6.yaml
|
OS::TripleO::Compute::Ports::StoragePort: ../../../../network/ports/storage_v6.yaml
|
||||||
OS::TripleO::CephStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
|
OS::TripleO::CephStorage::Ports::StoragePort: ../../../../network/ports/storage_v6.yaml
|
||||||
# StorageMgmt
|
# StorageMgmt
|
||||||
OS::TripleO::Network::StorageMgmt: ../network/storage_mgmt_v6.yaml
|
OS::TripleO::Network::StorageMgmt: ../../../../network/storage_mgmt_v6.yaml
|
||||||
OS::TripleO::Network::Ports::StorageMgmtVipPort: ../network/ports/storage_mgmt_v6.yaml
|
OS::TripleO::Network::Ports::StorageMgmtVipPort: ../../../../network/ports/storage_mgmt_v6.yaml
|
||||||
OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
|
OS::TripleO::Controller::Ports::StorageMgmtPort: ../../../../network/ports/storage_mgmt_v6.yaml
|
||||||
OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
|
OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../../../../network/ports/storage_mgmt_v6.yaml
|
||||||
# Tenant
|
# Tenant
|
||||||
OS::TripleO::Network::Tenant: ../network/tenant.yaml
|
OS::TripleO::Network::Tenant: ../../../../network/tenant.yaml
|
||||||
OS::TripleO::Network::Ports::TenantVipPort: ../network/ports/tenant.yaml
|
OS::TripleO::Network::Ports::TenantVipPort: ../../../../network/ports/tenant.yaml
|
||||||
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant.yaml
|
OS::TripleO::Controller::Ports::TenantPort: ../../../../network/ports/tenant.yaml
|
||||||
OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant.yaml
|
OS::TripleO::Compute::Ports::TenantPort: ../../../../network/ports/tenant.yaml
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
CephIPv6: True
|
CephIPv6: True
|
||||||
CorosyncIPv6: True
|
CorosyncIPv6: True
|
||||||
|
@ -1,29 +1,29 @@
|
|||||||
resource_registry:
|
resource_registry:
|
||||||
# Redis
|
# Redis
|
||||||
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip.yaml
|
OS::TripleO::Network::Ports::RedisVipPort: ../../../../network/ports/vip.yaml
|
||||||
# External
|
# External
|
||||||
OS::TripleO::Network::External: ../network/external.yaml
|
OS::TripleO::Network::External: ../../../../network/external.yaml
|
||||||
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external.yaml
|
OS::TripleO::Network::Ports::ExternalVipPort: ../../../../network/ports/external.yaml
|
||||||
OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external.yaml
|
OS::TripleO::Controller::Ports::ExternalPort: ../../../../network/ports/external.yaml
|
||||||
# InternalApi
|
# InternalApi
|
||||||
OS::TripleO::Network::InternalApi: ../network/internal_api.yaml
|
OS::TripleO::Network::InternalApi: ../../../../network/internal_api.yaml
|
||||||
OS::TripleO::Network::Ports::InternalApiVipPort: ../network/ports/internal_api.yaml
|
OS::TripleO::Network::Ports::InternalApiVipPort: ../../../../network/ports/internal_api.yaml
|
||||||
OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api.yaml
|
OS::TripleO::Controller::Ports::InternalApiPort: ../../../../network/ports/internal_api.yaml
|
||||||
OS::TripleO::Compute::Ports::InternalApiPort: ../network/ports/internal_api.yaml
|
OS::TripleO::Compute::Ports::InternalApiPort: ../../../../network/ports/internal_api.yaml
|
||||||
# Storage
|
# Storage
|
||||||
OS::TripleO::Network::Storage: ../network/storage.yaml
|
OS::TripleO::Network::Storage: ../../../../network/storage.yaml
|
||||||
OS::TripleO::Network::Ports::StorageVipPort: ../network/ports/storage.yaml
|
OS::TripleO::Network::Ports::StorageVipPort: ../../../../network/ports/storage.yaml
|
||||||
OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage.yaml
|
OS::TripleO::Controller::Ports::StoragePort: ../../../../network/ports/storage.yaml
|
||||||
OS::TripleO::Compute::Ports::StoragePort: ../network/ports/storage.yaml
|
OS::TripleO::Compute::Ports::StoragePort: ../../../../network/ports/storage.yaml
|
||||||
OS::TripleO::CephStorage::Ports::StoragePort: ../network/ports/storage.yaml
|
OS::TripleO::CephStorage::Ports::StoragePort: ../../../../network/ports/storage.yaml
|
||||||
# StorageMgmt
|
# StorageMgmt
|
||||||
OS::TripleO::Network::StorageMgmt: ../network/storage_mgmt.yaml
|
OS::TripleO::Network::StorageMgmt: ../../../../network/storage_mgmt.yaml
|
||||||
OS::TripleO::Network::Ports::StorageMgmtVipPort: ../network/ports/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::Controller::Ports::StorageMgmtPort: ../../../../network/ports/storage_mgmt.yaml
|
||||||
OS::TripleO::Compute::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
|
OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../../../../network/ports/storage_mgmt.yaml
|
||||||
# Tenant
|
# Tenant
|
||||||
OS::TripleO::Network::Tenant: ../network/tenant.yaml
|
OS::TripleO::Network::Tenant: ../../../../network/tenant.yaml
|
||||||
OS::TripleO::Network::Ports::TenantVipPort: ../network/ports/tenant.yaml
|
OS::TripleO::Network::Ports::TenantVipPort: ../../../../network/ports/tenant.yaml
|
||||||
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant.yaml
|
OS::TripleO::Controller::Ports::TenantPort: ../../../../network/ports/tenant.yaml
|
||||||
OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant.yaml
|
OS::TripleO::Compute::Ports::TenantPort: ../../../../network/ports/tenant.yaml
|
||||||
|
@ -1,28 +1,28 @@
|
|||||||
resource_registry:
|
resource_registry:
|
||||||
# Redis
|
# Redis
|
||||||
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip.yaml
|
OS::TripleO::Network::Ports::RedisVipPort: ../../../../network/ports/vip.yaml
|
||||||
# External
|
# External
|
||||||
OS::TripleO::Network::External: ../network/external.yaml
|
OS::TripleO::Network::External: ../../../../network/external.yaml
|
||||||
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external.yaml
|
OS::TripleO::Network::Ports::ExternalVipPort: ../../../../network/ports/external.yaml
|
||||||
OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external.yaml
|
OS::TripleO::Controller::Ports::ExternalPort: ../../../../network/ports/external.yaml
|
||||||
# InternalApi
|
# InternalApi
|
||||||
OS::TripleO::Network::InternalApi: ../network/internal_api.yaml
|
OS::TripleO::Network::InternalApi: ../../../../network/internal_api.yaml
|
||||||
OS::TripleO::Network::Ports::InternalApiVipPort: ../network/ports/internal_api.yaml
|
OS::TripleO::Network::Ports::InternalApiVipPort: ../../../../network/ports/internal_api.yaml
|
||||||
OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api.yaml
|
OS::TripleO::Controller::Ports::InternalApiPort: ../../../../network/ports/internal_api.yaml
|
||||||
OS::TripleO::Compute::Ports::InternalApiPort: ../network/ports/internal_api.yaml
|
OS::TripleO::Compute::Ports::InternalApiPort: ../../../../network/ports/internal_api.yaml
|
||||||
# Storage
|
# Storage
|
||||||
OS::TripleO::Network::Storage: ../network/storage.yaml
|
OS::TripleO::Network::Storage: ../../../../network/storage.yaml
|
||||||
OS::TripleO::Network::Ports::StorageVipPort: ../network/ports/storage.yaml
|
OS::TripleO::Network::Ports::StorageVipPort: ../../../../network/ports/storage.yaml
|
||||||
OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage.yaml
|
OS::TripleO::Controller::Ports::StoragePort: ../../../../network/ports/storage.yaml
|
||||||
OS::TripleO::Compute::Ports::StoragePort: ../network/ports/storage.yaml
|
OS::TripleO::Compute::Ports::StoragePort: ../../../../network/ports/storage.yaml
|
||||||
OS::TripleO::CephStorage::Ports::StoragePort: ../network/ports/storage.yaml
|
OS::TripleO::CephStorage::Ports::StoragePort: ../../../../network/ports/storage.yaml
|
||||||
# StorageMgmt
|
# StorageMgmt
|
||||||
OS::TripleO::Network::StorageMgmt: ../network/storage_mgmt.yaml
|
OS::TripleO::Network::StorageMgmt: ../../../../network/storage_mgmt.yaml
|
||||||
OS::TripleO::Network::Ports::StorageMgmtVipPort: ../network/ports/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::Controller::Ports::StorageMgmtPort: ../../../../network/ports/storage_mgmt.yaml
|
||||||
OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
|
OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../../../../network/ports/storage_mgmt.yaml
|
||||||
# Tenant
|
# Tenant
|
||||||
OS::TripleO::Network::Tenant: ../network/tenant.yaml
|
OS::TripleO::Network::Tenant: ../../../../network/tenant.yaml
|
||||||
OS::TripleO::Network::Ports::TenantVipPort: ../network/ports/tenant.yaml
|
OS::TripleO::Network::Ports::TenantVipPort: ../../../../network/ports/tenant.yaml
|
||||||
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant.yaml
|
OS::TripleO::Controller::Ports::TenantPort: ../../../../network/ports/tenant.yaml
|
||||||
OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant.yaml
|
OS::TripleO::Compute::Ports::TenantPort: ../../../../network/ports/tenant.yaml
|
||||||
|
Loading…
x
Reference in New Issue
Block a user