From 95ee731525170e8dd4df813d5ca7e43b0ba2f4eb Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Wed, 19 Apr 2017 12:08:41 -0400 Subject: Adding yamllint to build checks - making formatting changes to yaml files to meet yamllint checks Change-Id: Id48a8446512943e908e61dc00bbe6c033af27775 Signed-off-by: Dan Radez --- build/network-environment.yaml | 58 ++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 19 deletions(-) (limited to 'build/network-environment.yaml') diff --git a/build/network-environment.yaml b/build/network-environment.yaml index 40f8e3be..cb6e0198 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -1,39 +1,59 @@ +--- # Enable the creation of Neutron networks for isolated OvercloudV # traffic and configure each role to assign ports (related # to that role) on these networks. # Many networks are disabled by default because they are not used # in a typical configuration. Override via parameter_defaults. resource_registry: - OS::TripleO::Network::External: /usr/share/openstack-tripleo-heat-templates/network/external.yaml + OS::TripleO::Network::External: |- + /usr/share/openstack-tripleo-heat-templates/network/external.yaml OS::TripleO::Network::InternalApi: OS::Heat::None OS::TripleO::Network::StorageMgmt: OS::Heat::None OS::TripleO::Network::Storage: OS::Heat::None OS::TripleO::Network::Tenant: OS::Heat::None # Management network is optional and disabled by default - #OS::TripleO::Network::Management: /usr/share/openstack-tripleo-heat-templates/network/noop.yaml + # OS::TripleO::Network::Management: + # /usr/share/openstack-tripleo-heat-templates/network/noop.yaml # Port assignments for the VIPs - OS::TripleO::Network::Ports::ExternalVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml - OS::TripleO::Network::Ports::InternalApiVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - OS::TripleO::Network::Ports::StorageVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - OS::TripleO::Network::Ports::StorageMgmtVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - OS::TripleO::Network::Ports::RedisVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/ctlplane_vip.yaml + OS::TripleO::Network::Ports::ExternalVipPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml + OS::TripleO::Network::Ports::InternalApiVipPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Network::Ports::StorageVipPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Network::Ports::StorageMgmtVipPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Network::Ports::RedisVipPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/ctlplane_vip.yaml # Port assignments for the controller role - OS::TripleO::Controller::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml - OS::TripleO::Controller::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - OS::TripleO::Controller::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - OS::TripleO::Controller::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - OS::TripleO::Controller::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - #OS::TripleO::Controller::Ports::ManagementPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Controller::Ports::ExternalPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml + OS::TripleO::Controller::Ports::InternalApiPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Controller::Ports::StoragePort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Controller::Ports::StorageMgmtPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Controller::Ports::TenantPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + # OS::TripleO::Controller::Ports::ManagementPort: + # /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml # Port assignments for the compute role - OS::TripleO::Compute::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - OS::TripleO::Compute::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - OS::TripleO::Compute::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - OS::TripleO::Compute::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml - OS::TripleO::Compute::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml - #OS::TripleO::Compute::Ports::ManagementPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Compute::Ports::InternalApiPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Compute::Ports::StorageMgmtPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Compute::Ports::StoragePort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Compute::Ports::TenantPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml + OS::TripleO::Compute::Ports::ExternalPort: |- + /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml + # OS::TripleO::Compute::Ports::ManagementPort: + # /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml # NIC assignments OS::TripleO::Compute::Net::SoftwareConfig: nics/compute.yaml -- cgit 1.2.3-korg