diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-25 17:21:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-25 17:21:00 +0000 |
| commit | afbe64a2dae79c9d4344f55a54e8c953f680e3e1 (patch) | |
| tree | 02f346137c2b8d8d6b440ddd2ce5e2b8f0d99f76 | |
| parent | 54301a9b21b34de9d4036b72e9a66f05b19e8507 (diff) | |
| parent | a2c999c39c7984d4a8a728119758891117746868 (diff) | |
Merge "Move neutron api services to ControllerOpenstack" into stable/pike
| -rw-r--r-- | roles/ControllerOpenstack.yaml | 4 | ||||
| -rw-r--r-- | roles/Networker.yaml | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 066962c1..2f86d2d2 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 ac30c2fd..afd3b101 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 |