From 12d569297b6c0cd9f376559a645aa67f34d81945 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 21 Sep 2017 16:11:36 -0600 Subject: [PATCH] Fix Tenant network declaration Previously the network-isoloation-no-tunneling.yaml environment file was improperly referencing a non-existant noop.yaml for networks. This change updates it to reference OS::Heat::None which is the correct setting for this configuration. In newer versions this was converted to a jinja2 template file due to the composable network effort. Change-Id: Ia12763ea58b00c8c6a66a929f51731d53e8a4561 Closes-Bug: #1718797 --- environments/network-isolation-no-tunneling.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/network-isolation-no-tunneling.yaml b/environments/network-isolation-no-tunneling.yaml index ff1d7887d8..ffdf2f7a4c 100644 --- a/environments/network-isolation-no-tunneling.yaml +++ b/environments/network-isolation-no-tunneling.yaml @@ -8,7 +8,7 @@ resource_registry: OS::TripleO::Network::InternalApi: ../network/internal_api.yaml OS::TripleO::Network::StorageMgmt: ../network/storage_mgmt.yaml OS::TripleO::Network::Storage: ../network/storage.yaml - OS::TripleO::Network::Tenant: ../network/noop.yaml + OS::TripleO::Network::Tenant: OS::Heat::None # Management network is optional and disabled by default. # To enable it, include environments/network-management.yaml #OS::TripleO::Network::Management: ../network/management.yaml