X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fnetwork-environment.yaml;h=3fd22e3d327cdfd481d832f06860c91fcf6210b6;hb=6b304d2e2d9addcf33ad7e7ce5481d37a6b8ee4e;hp=f1503feb537cf30a315e96c2827a3f97a6076270;hpb=73e52458f6f22ec453ec08cc0960d8b8e0ce45fe;p=apex.git diff --git a/build/network-environment.yaml b/build/network-environment.yaml index f1503feb..3fd22e3d 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -1,76 +1,76 @@ +--- # 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::InternalApi: /usr/share/openstack-tripleo-heat-templates/network/noop.yaml - OS::TripleO::Network::StorageMgmt: /usr/share/openstack-tripleo-heat-templates/network/noop.yaml - OS::TripleO::Network::Storage: /usr/share/openstack-tripleo-heat-templates/network/noop.yaml - OS::TripleO::Network::Tenant: /usr/share/openstack-tripleo-heat-templates/network/noop.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 OS::TripleO::Controller::Net::SoftwareConfig: nics/controller.yaml - parameter_defaults: NeutronExternalNetworkBridge: 'br-ex' - ControlPlaneSubnetCidr: "24" - ControlPlaneDefaultRoute: 192.0.2.1 - ExternalNetCidr: 192.168.37.0/24 - ExternalAllocationPools: [{'start': '192.168.37.50', 'end': '192.168.37.99'}] - ExternalInterfaceDefaultRoute: 192.168.37.1 - EC2MetadataIp: 192.0.2.1 - DnsServers: ["8.8.8.8","8.8.4.4"] - TenantNetCidr: 172.17.0.0/24 - TenantAllocationPools: [{'start': '172.17.0.10', 'end': '172.17.0.200'}] - StorageNetCidr: 172.18.0.0/24 - StorageAllocationPools: [{'start': '172.18.0.10', 'end': '172.18.0.200'}] - - # Customize the VLAN IDs to match the local environment - InternalApiNetworkVlanID: 10 # usually collapsed onto Admin/Provisioning - StorageNetworkVlanID: 20 - # StorageMgmtNetworkVlanID: 30 # NOT IMPLEMENTED - TenantNetworkVlanID: 40 - ExternalNetworkVlanID: 50 -parameters: ServiceNetMap: NeutronTenantNetwork: tenant CeilometerApiNetwork: internal_api AodhApiNetwork: internal_api - OpenDaylightApiNetwork: internal_api + OpendaylightApiNetwork: internal_api MongoDbNetwork: internal_api CinderApiNetwork: internal_api CinderIscsiNetwork: storage - GlanceApiNetwork: storage + GlanceApiNetwork: internal_api GlanceRegistryNetwork: internal_api KeystoneAdminApiNetwork: ctlplane KeystonePublicApiNetwork: internal_api @@ -81,6 +81,8 @@ parameters: NovaVncProxyNetwork: internal_api SwiftMgmtNetwork: storage SwiftProxyNetwork: storage + TackerApiNetwork: internal_api + CongressApiNetwork: internal_api HorizonNetwork: internal_api MemcachedNetwork: internal_api RabbitMqNetwork: internal_api