From d8717786f078ba357f3150d67e96d73c66df130c Mon Sep 17 00:00:00 2001 From: Surojit Pathak Date: Fri, 20 Mar 2015 22:13:14 +0000 Subject: [PATCH] Removing duplicate service definition Services related to magnum were defined twice. Removing one such occurrence and positioning with more appropriate comment. Closes-bug: #1434747 Change-Id: I5fa3bf8fa2779cd9da77539a91534709fe6cdd75 --- contrib/devstack/localrc.example | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/devstack/localrc.example b/contrib/devstack/localrc.example index 5506519bd2..82ee459e2f 100644 --- a/contrib/devstack/localrc.example +++ b/contrib/devstack/localrc.example @@ -13,11 +13,6 @@ SERVICE_TOKEN=password enable_service rabbit # Enable Neutron which is required by Magnum and disable nova-network. - -enable_service magnum -enable_service m-cond -enable_service m-api - disable_service n-net enable_service q-svc enable_service q-agt @@ -26,6 +21,7 @@ enable_service q-l3 enable_service q-meta enable_service neutron +# Enable Magnum services enable_service magnum enable_service m-api enable_service m-cond