Use custom network-isolation-absolute.yaml in ipv4 net-iso jobs
The follow-up patch adds the storage-mgmt network to the compute node, so we can no longer use the shipped network-isolation.yaml. This change makes use of the generated network-isolation env with absolute paths pointing at /usr/share/openstack-tripleo-heat-templates Change-Id: I46b3c0a0fa2653a7e74929130bec29d900edaf6d
This commit is contained in:
Ben Nemec
parent
a20c66b967
commit
c0acf09f0d
|
|
@ -16,7 +16,7 @@ enable_pacemaker: true
|
|||
network_isolation: true
|
||||
network_isolation_type: "multiple-nics"
|
||||
network_isolation_args: >-
|
||||
-e {{ overcloud_templates_path }}/environments/network-isolation.yaml
|
||||
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml
|
||||
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
|
||||
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
resource_registry:
|
||||
# Redis
|
||||
OS::TripleO::Network::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
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
resource_registry:
|
||||
# Redis
|
||||
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip.yaml
|
||||
OS::TripleO::Controller::Ports::RedisVipPort: ../network/ports/vip.yaml
|
||||
# External
|
||||
OS::TripleO::Network::External: ../network/external.yaml
|
||||
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external.yaml
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
|||
# In ci our overcloud nodes don't have access to an external netwrok
|
||||
# --ntp-server is here to make the deploy command happy, the ci env
|
||||
# is on virt so the clocks should be in sync without it.
|
||||
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/network-templates/network-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/net-iso.yaml"
|
||||
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/network-templates/network-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/net-iso.yaml"
|
||||
NETISO_V4=1
|
||||
PACEMAKER=1
|
||||
PREDICTABLE_PLACEMENT=1
|
||||
|
|
|
|||
Loading…
Reference in New Issue