From e8b6d6debe2b056b404fc353f54b67364b58c59d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 10 Oct 2016 17:11:20 -0400 Subject: Migrate to stable/newton os-odl_l2_nofeature is now deprecated since new netvirt only supports odl_l3. JIRA: APEX-299 Change-Id: I3557ecb85fa4cd11bba96aa9410e56a8e8cceb00 Signed-off-by: Tim Rozet --- build/network-environment.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'build/network-environment.yaml') diff --git a/build/network-environment.yaml b/build/network-environment.yaml index 8b5b070c..bd65dd9d 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -5,10 +5,10 @@ # 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::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 @@ -39,6 +39,11 @@ resource_registry: OS::TripleO::Compute::Net::SoftwareConfig: nics/compute.yaml OS::TripleO::Controller::Net::SoftwareConfig: nics/controller.yaml + # Services + OS::TripleO::Services::SwiftStorage: OS::Heat::None + OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None + OS::TripleO::Services::SwiftProxy: OS::Heat::None + parameter_defaults: NeutronExternalNetworkBridge: 'br-ex' ControlPlaneSubnetCidr: "24" @@ -59,13 +64,11 @@ parameter_defaults: # 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 -- cgit 1.2.3-korg