From 964a5d738b8dbb6beb077d76448c6f3a84be2500 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 19 Sep 2017 15:36:43 -0600 Subject: [PATCH] Move neutron api services to ControllerOpenstack The Networker role should not have the api services run on it. Instead these services should run as part of the ControllerOpenstack role that should be used with this role. Change-Id: Iabfe276fe700843f3a8da0b9e9220b2f82e20ec9 Closes-Bug: #1718299 --- roles/ControllerOpenstack.yaml | 4 ++++ roles/Networker.yaml | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 6b409617f5..3dbab94c93 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -75,6 +75,10 @@ - OS::TripleO::Services::Memcached - OS::TripleO::Services::MongoDb - OS::TripleO::Services::MySQLClient + - OS::TripleO::Services::NeutronApi + - OS::TripleO::Services::NeutronBgpVpnApi + - OS::TripleO::Services::NeutronCorePlugin + - OS::TripleO::Services::NeutronL2gwApi - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor - OS::TripleO::Services::NovaConsoleauth diff --git a/roles/Networker.yaml b/roles/Networker.yaml index ac30c2fdf5..afd3b101c9 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -3,10 +3,11 @@ ############################################################################### - name: Networker description: | - Standalone networking role to run Neutron services their own. Includes + Standalone networking role to run Neutron agents their own. Includes Pacemaker integration via PacemakerRemote networks: - InternalApi + - Tenant HostnameFormatDefault: '%stackname%-networker-%index%' ServicesDefault: - OS::TripleO::Services::AuditD @@ -17,12 +18,8 @@ - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronApi - - OS::TripleO::Services::NeutronBgpVpnApi - - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronL2gwAgent - - OS::TripleO::Services::NeutronL2gwApi - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLbaasv2Agent - OS::TripleO::Services::NeutronMetadataAgent