From b6bfa5b7cbe09223228dadf9874ccd0c14844652 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Tue, 6 Mar 2018 10:45:25 -0500 Subject: [PATCH] Fix network-isolation.yaml relative paths for ci These relative paths were incorrect given where these environment files live in the templates directory tree. These environment files aren't actually used by ci as their equivalent network-isolation-absolute.yaml versions are preferred. However, if we fix these paths we could consider switching ci over to use these as it's arguable more preferrable instead of the hardcoded packaged path. Change-Id: Ib0e4779c4883776e25bf7eb5aee60a91ce28a73d --- .../multiple-nics-ipv6/network-isolation.yaml | 42 +++++++++--------- .../multiple-nics/network-isolation.yaml | 44 +++++++++---------- .../public-bond/network-isolation.yaml | 42 +++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/ci/environments/network/multiple-nics-ipv6/network-isolation.yaml b/ci/environments/network/multiple-nics-ipv6/network-isolation.yaml index 4b746dc1cc..2050708899 100644 --- a/ci/environments/network/multiple-nics-ipv6/network-isolation.yaml +++ b/ci/environments/network/multiple-nics-ipv6/network-isolation.yaml @@ -1,31 +1,31 @@ resource_registry: # Redis - OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip_v6.yaml + OS::TripleO::Network::Ports::RedisVipPort: ../../../../network/ports/vip_v6.yaml # External - OS::TripleO::Network::External: ../network/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::Network::External: ../../../../network/external_v6.yaml + OS::TripleO::Network::Ports::ExternalVipPort: ../../../../network/ports/external_v6.yaml + OS::TripleO::Controller::Ports::ExternalPort: ../../../../network/ports/external_v6.yaml # InternalApi - OS::TripleO::Network::InternalApi: ../network/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::Compute::Ports::InternalApiPort: ../network/ports/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::Controller::Ports::InternalApiPort: ../../../../network/ports/internal_api_v6.yaml + OS::TripleO::Compute::Ports::InternalApiPort: ../../../../network/ports/internal_api_v6.yaml # Storage - OS::TripleO::Network::Storage: ../network/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::Compute::Ports::StoragePort: ../network/ports/storage_v6.yaml - OS::TripleO::CephStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml + OS::TripleO::Network::Storage: ../../../../network/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::Compute::Ports::StoragePort: ../../../../network/ports/storage_v6.yaml + OS::TripleO::CephStorage::Ports::StoragePort: ../../../../network/ports/storage_v6.yaml # StorageMgmt - OS::TripleO::Network::StorageMgmt: ../network/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::CephStorage::Ports::StorageMgmtPort: ../network/ports/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::Controller::Ports::StorageMgmtPort: ../../../../network/ports/storage_mgmt_v6.yaml + OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../../../../network/ports/storage_mgmt_v6.yaml # Tenant - OS::TripleO::Network::Tenant: ../network/tenant.yaml - OS::TripleO::Network::Ports::TenantVipPort: ../network/ports/tenant.yaml - OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant.yaml - OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant.yaml + OS::TripleO::Network::Tenant: ../../../../network/tenant.yaml + OS::TripleO::Network::Ports::TenantVipPort: ../../../../network/ports/tenant.yaml + OS::TripleO::Controller::Ports::TenantPort: ../../../../network/ports/tenant.yaml + OS::TripleO::Compute::Ports::TenantPort: ../../../../network/ports/tenant.yaml parameter_defaults: CephIPv6: True CorosyncIPv6: True diff --git a/ci/environments/network/multiple-nics/network-isolation.yaml b/ci/environments/network/multiple-nics/network-isolation.yaml index 328a8eeb27..144df8dd83 100644 --- a/ci/environments/network/multiple-nics/network-isolation.yaml +++ b/ci/environments/network/multiple-nics/network-isolation.yaml @@ -1,29 +1,29 @@ resource_registry: # Redis - OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip.yaml + OS::TripleO::Network::Ports::RedisVipPort: ../../../../network/ports/vip.yaml # External - OS::TripleO::Network::External: ../network/external.yaml - OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external.yaml - OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external.yaml + OS::TripleO::Network::External: ../../../../network/external.yaml + OS::TripleO::Network::Ports::ExternalVipPort: ../../../../network/ports/external.yaml + OS::TripleO::Controller::Ports::ExternalPort: ../../../../network/ports/external.yaml # InternalApi - OS::TripleO::Network::InternalApi: ../network/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::Compute::Ports::InternalApiPort: ../network/ports/internal_api.yaml + OS::TripleO::Network::InternalApi: ../../../../network/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::Compute::Ports::InternalApiPort: ../../../../network/ports/internal_api.yaml # Storage - OS::TripleO::Network::Storage: ../network/storage.yaml - 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 + OS::TripleO::Network::Storage: ../../../../network/storage.yaml + 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::Compute::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml - OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml + 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 - OS::TripleO::Network::Ports::TenantVipPort: ../network/ports/tenant.yaml - OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant.yaml - OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant.yaml + OS::TripleO::Network::Tenant: ../../../../network/tenant.yaml + OS::TripleO::Network::Ports::TenantVipPort: ../../../../network/ports/tenant.yaml + OS::TripleO::Controller::Ports::TenantPort: ../../../../network/ports/tenant.yaml + OS::TripleO::Compute::Ports::TenantPort: ../../../../network/ports/tenant.yaml diff --git a/ci/environments/network/public-bond/network-isolation.yaml b/ci/environments/network/public-bond/network-isolation.yaml index 2c18f2f4b5..89bd1cbc60 100644 --- a/ci/environments/network/public-bond/network-isolation.yaml +++ b/ci/environments/network/public-bond/network-isolation.yaml @@ -1,28 +1,28 @@ resource_registry: # Redis - OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip.yaml + OS::TripleO::Network::Ports::RedisVipPort: ../../../../network/ports/vip.yaml # External - OS::TripleO::Network::External: ../network/external.yaml - OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external.yaml - OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external.yaml + OS::TripleO::Network::External: ../../../../network/external.yaml + OS::TripleO::Network::Ports::ExternalVipPort: ../../../../network/ports/external.yaml + OS::TripleO::Controller::Ports::ExternalPort: ../../../../network/ports/external.yaml # InternalApi - OS::TripleO::Network::InternalApi: ../network/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::Compute::Ports::InternalApiPort: ../network/ports/internal_api.yaml + OS::TripleO::Network::InternalApi: ../../../../network/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::Compute::Ports::InternalApiPort: ../../../../network/ports/internal_api.yaml # Storage - OS::TripleO::Network::Storage: ../network/storage.yaml - 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 + OS::TripleO::Network::Storage: ../../../../network/storage.yaml + 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 + 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 - OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant.yaml - OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant.yaml + OS::TripleO::Network::Tenant: ../../../../network/tenant.yaml + OS::TripleO::Network::Ports::TenantVipPort: ../../../../network/ports/tenant.yaml + OS::TripleO::Controller::Ports::TenantPort: ../../../../network/ports/tenant.yaml + OS::TripleO::Compute::Ports::TenantPort: ../../../../network/ports/tenant.yaml