From 136a001ad22576d9330f51ce88e86d07fc9b3c52 Mon Sep 17 00:00:00 2001
From: Li Jiale <lijiale@cmss.chinamobile.com>
Date: Tue, 19 Jun 2018 13:48:25 +0800
Subject: [PATCH] tacker conductor service doesn't start after manual
 installation

The installation instructions for tacker conductor are not
included in the installation manual.

Close-Bug: #1777566
Change-Id: I47b2f76fe7df9b4de229d3bdc95700ad9dc1f99a
---
 doc/source/install/manual_installation.rst  | 20 +++++++++++++++++---
 etc/systemd/system/tacker-conductor.service | 12 ++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 etc/systemd/system/tacker-conductor.service

diff --git a/doc/source/install/manual_installation.rst b/doc/source/install/manual_installation.rst
index dd446c3c4..459d862a4 100644
--- a/doc/source/install/manual_installation.rst
+++ b/doc/source/install/manual_installation.rst
@@ -44,7 +44,7 @@ is like the below:
     export OS_TENANT_NAME=admin
     export OS_USERNAME=admin
     export OS_PASSWORD=KTskN5eUMTpeHLKorRcZBBbH0AM96wdvgQhwENxY
-    export OS_AUTH_URL=http://localhost:5000/v3
+    export OS_AUTH_URL=http://localhost:5000/identity
     export OS_INTERFACE=internal
     export OS_IDENTITY_API_VERSION=3
     export OS_REGION_NAME=RegionOne
@@ -247,13 +247,14 @@ If you are using keystone v2 then,
 
 ..
 
-10). To support systemd, copy tacker.service file to "/etc/systemd/system/"
-directory, and restart systemctl daemon.
+10). To support systemd, copy tacker.service and tacker-conductor.service file to
+     "/etc/systemd/system/" directory, and restart systemctl daemon.
 
 .. code-block:: console
 
    sudo su
    cp etc/systemd/system/tacker.service /etc/systemd/system/
+   cp etc/systemd/system/tacker-conductor.service /etc/systemd/system/
    systemctl daemon-reload
 
 ..
@@ -331,3 +332,16 @@ required because the console will be locked by a running process.
        --config-file /usr/local/etc/tacker/tacker.conf \
        --log-file /var/log/tacker/tacker.log
 ..
+
+Starting Tacker conductor
+=========================
+
+1).Open a new console and launch tacker-conductor. A separate terminal is
+required because the console will be locked by a running process.
+
+.. code-block:: console
+
+   sudo python /usr/local/bin/tacker-conductor \
+       --config-file /usr/local/etc/tacker/tacker.conf \
+       --log-file /var/log/tacker/tacker-conductor.log
+..
diff --git a/etc/systemd/system/tacker-conductor.service b/etc/systemd/system/tacker-conductor.service
new file mode 100644
index 000000000..5ca1f001b
--- /dev/null
+++ b/etc/systemd/system/tacker-conductor.service
@@ -0,0 +1,12 @@
+[Unit]
+Description = OpenStack tacker conductor service
+
+[Service]
+ExecReload = /bin/kill -HUP $MAINPID
+TimeoutStopSec = 300
+KillMode = process
+WorkingDirectory = /tmp
+ExecStart=/usr/local/bin/tacker-conductor --config-file /etc/tacker/tacker.conf
+
+[Install]
+WantedBy = multi-user.target