From 458da74d0f7bc97c8f4bdac03660b39eecce03fa Mon Sep 17 00:00:00 2001
From: Yuval Brik <yuval@brik.org.il>
Date: Wed, 3 May 2017 16:16:16 +0300
Subject: [PATCH] Remove nova-cert from devstack

nova-cert is removed in pike:
See: I2c78a0c6599b92040146cf9f0042cff8fd2509c3

Change-Id: I365a04a365b13f9c7858c487069a6fe3c9a9a350
---
 devstack/devstackgaterc     | 7 ++++++-
 devstack/local.conf.sample  | 2 +-
 doc/source/installation.rst | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/devstack/devstackgaterc b/devstack/devstackgaterc
index cb27315b..95f63fc1 100644
--- a/devstack/devstackgaterc
+++ b/devstack/devstackgaterc
@@ -18,11 +18,16 @@
 #
 
 s=rabbit,mysql,key
-s+=,n-cpu,n-api,n-crt,n-cond,n-sch,n-cauth,placement-api
+s+=,n-cpu,n-api,n-cond,n-sch,n-cauth,placement-api
 # n-obj has been removed from mitaka
 if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
     s+=,n-obj
 fi
+
+if [[ "stable/kilo stable/liberty stable/mitaka stable/ocata" =~ $ZUUL_BRANCH ]]; then
+    s+=,n-crt
+fi
+
 s+=,neutron,q-svc,q-agt,q-dhcp,q-meta
 s+=,cinder,g-api,g-reg
 s+=,c-api,c-vol,c-sch,c-bak,horizon
diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample
index 655d8fcd..e9a9e18f 100644
--- a/devstack/local.conf.sample
+++ b/devstack/local.conf.sample
@@ -12,7 +12,7 @@ enable_plugin heat https://git.openstack.org/openstack/heat master
 
 #run the services you want to use
 ENABLED_SERVICES=rabbit,mysql,key
-ENABLED_SERVICES+=,n-cpu,n-api,n-crt,n-obj,n-cond,n-sch,n-novnc,n-cauth
+ENABLED_SERVICES+=,n-cpu,n-api,n-obj,n-cond,n-sch,n-novnc,n-cauth
 ENABLED_SERVICES+=,placement-api
 ENABLED_SERVICES+=,neutron,q-svc,q-agt,q-dhcp,q-meta
 ENABLED_SERVICES+=,cinder,g-api,g-reg
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 2b418e92..81c481f5 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -59,7 +59,7 @@ Nova (optional)
 
 .. code-block:: none
 
-        enable_service n-cpu n-api n-crt n-cond n-sch n-novnc n-cauth placement-api
+        enable_service n-cpu n-api n-cond n-sch n-novnc n-cauth placement-api
 
 
 Neutron (optional)