From 69844fe9c7108d5b1c2efccd4048e37cf1e9037d Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin034@gmail.com>
Date: Sun, 26 Jan 2020 22:33:19 +0000
Subject: [PATCH] Start zun-cni-daemon in devstack

Change-Id: I2afe6eba3cfd9687a0eea390f23e95a75888aaec
---
 devstack/lib/zun  | 5 +++++
 devstack/settings | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/devstack/lib/zun b/devstack/lib/zun
index d014b9eb7..8464c336a 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -333,6 +333,8 @@ function start_zun_api {
 function start_zun_compute {
     echo "Start zun compute..."
     run_process zun-compute "$ZUN_BIN_DIR/zun-compute"
+    echo "Start zun cni daemon..."
+    run_process zun-cni-daemon "$ZUN_BIN_DIR/zun-cni-daemon"
 }
 
 # start_zun() - Start running processes, including screen
@@ -355,6 +357,9 @@ function stop_zun {
     if is_service_enabled zun-wsproxy; then
         stop_process zun-wsproxy
     fi
+    if is_service_enabled zun-cni-daemon; then
+        stop_process zun-cni-daemon
+    fi
 }
 
 # Restore xtrace
diff --git a/devstack/settings b/devstack/settings
index b9d26f789..39721c617 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -22,6 +22,8 @@ if [[ ${HOST_IP} == ${SERVICE_HOST} ]] || [[ "[${HOST_IPV6}]" == "${SERVICE_HOST
     enable_service zun-api
     enable_service zun-compute
     enable_service zun-wsproxy
+    enable_service zun-cni-daemon
 else
     enable_service zun-compute
+    enable_service zun-cni-daemon
 fi