Merge "Correct karbor source install doc"

doc/source/install/common_configure.rst

@@ -1,4 +1,4 @@
-1. Edit the ``/etc/karbor/karbor.conf`` file and complete the following
+#. Edit the ``/etc/karbor/karbor.conf`` file and complete the following
    actions:
 
    * In the ``[database]`` section, configure database access:
@@ -19,7 +19,7 @@
 
         [DEFAULT]
         ...
-        transport_url = rabbit://openstack:RABBIT_PASS@controller
+        transport_url = rabbit://openstack:RABBIT_PASS@controller:5672
 
      Replace ``RABBIT_PASS`` with the password you chose for the
      ``openstack`` account in ``RabbitMQ``.
@@ -63,7 +63,7 @@
      Replace ``KARBOR_PASS`` with the password you chose for the
      ``karbor`` user in the Identity service.
 
-2. Populate the Data Protection database:
+#. Populate the Data Protection database:
 
    .. code-block:: console
 

doc/source/install/install-source.rst

@@ -27,12 +27,19 @@ executables:
 * ``karbor-operationengine``: karbor operationengine script
 * ``karbor-manage``: karbor manage script
 
+Generate sample configuration file karbor.conf.sample::
+
+    #use tox
+    tox -egenconfig
+    #or direct run oslo-config-generator
+    oslo-config-generator --config-file etc/oslo-config-generator/karbor.conf
+
 Install sample configuration files::
 
     mkdir /etc/karbor
     cp etc/api-paste.ini /etc/karbor
-    cp /etc/karbor.conf /etc/karbor
-    cp /etc/policy.json /etc/karbor
+    cp etc/karbor.conf.sample /etc/karbor/karbor.conf
+    cp etc/policy.json /etc/karbor
     cp -r etc/providers.d /etc/karbor
 
 Create the log directory::
@@ -58,6 +65,14 @@ Retrieve and install karbor client::
     cd python-karborclient
     python setup.py install
 
+Configure components
+--------------------
+
+#. Add system user::
+
+    groupadd karbor
+    useradd karbor -g karbor -d /var/lib/karbor -s /sbin/nologin
+
 .. include:: common_configure.rst
 
 Finalize installation