From 9d9289cf6dda5cc2c0feb332125357fe32106ef9 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 16 Feb 2018 13:47:10 -0800 Subject: [PATCH] undercloud: remove duplicate Neutron Server entry ... or the deployment fails since we try to deploy twice the OS::TripleO::Services::NeutronApi service. Change-Id: I92d5d037074494c40fb2b1968985a95ffd2fae12 --- roles/Undercloud.yaml | 1 - roles/UndercloudLight.yaml | 1 - roles_data_undercloud.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index b5e527aa8d..b5f3f80818 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -38,7 +38,6 @@ - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor diff --git a/roles/UndercloudLight.yaml b/roles/UndercloudLight.yaml index 0c8a3560b9..d75f8ab231 100644 --- a/roles/UndercloudLight.yaml +++ b/roles/UndercloudLight.yaml @@ -29,7 +29,6 @@ - OS::TripleO::Services::NeutronApi - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronDhcpAgent - - OS::TripleO::Services::NeutronServer - OS::TripleO::Services::RabbitMQ - OS::TripleO::Services::Rhsm - OS::TripleO::Services::SwiftProxy diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 06e111b996..92961dc764 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -41,7 +41,6 @@ - OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor