From 21086d1bce255c464f57bf6bc183894d7d9bbfba Mon Sep 17 00:00:00 2001 From: Zhijiang Hu Date: Tue, 5 Sep 2017 14:02:51 +0800 Subject: Add doc for building kolla image Change-Id: I7d25c13221e60d40801dc694efe8c32c31ebfabf Signed-off-by: Zhijiang Hu --- docs/release/installation/build_kolla_image.rst | 39 +++++++++++++++++++++++++ docs/release/installation/index.rst | 1 + docs/release/installation/upgrade.rst | 4 ++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 docs/release/installation/build_kolla_image.rst diff --git a/docs/release/installation/build_kolla_image.rst b/docs/release/installation/build_kolla_image.rst new file mode 100644 index 00000000..8a55de50 --- /dev/null +++ b/docs/release/installation/build_kolla_image.rst @@ -0,0 +1,39 @@ +.. _daisy-build-kolla-image: + +.. This document is protected/licensed under the following conditions +.. (c) Sun Jing (ZTE corporation) +.. Licensed under a Creative Commons Attribution 4.0 International License. +.. You should have received a copy of the license along with this work. +.. If not, see . + +Build Your Own Kolla Image For Daisy +==================================== + +The following command will build Ocata Kolla image for Daisy based on +Daisy's fork of openstack/kolla project. This is also the method Daisy +used for the Euphrates release. + +The reason why here use fork of openstack/kolla project is to backport +ODL support from pike branch to ocata branch. + +.. code-block:: console + + cd ./ci + ./kolla-build.sh + + + +After building, the above command will put Kolla image into +/tmp/kolla-build-output directory and the image version will be 4.0.2. + +If you want to build an image which can update 4.0.2, run the following +command: + +.. code-block:: console + + cd ./ci + ./kolla-build.sh -e 1 + + +This time the image version will be 4.0.2.1 which is higher than 4.0.2 +so that it can be used to replace the old version. diff --git a/docs/release/installation/index.rst b/docs/release/installation/index.rst index 20d1e3b7..0e22839b 100644 --- a/docs/release/installation/index.rst +++ b/docs/release/installation/index.rst @@ -17,3 +17,4 @@ OPNFV Daisy4nfv Installation Guide vmdeploy.rst recovery.rst upgrade.rst + build_kolla_image.rst diff --git a/docs/release/installation/upgrade.rst b/docs/release/installation/upgrade.rst index 23b53e21..ce95d50b 100644 --- a/docs/release/installation/upgrade.rst +++ b/docs/release/installation/upgrade.rst @@ -11,7 +11,9 @@ update OpenStack minor version as the follows: Since Daisy's Kolla images are build by meeting the OPNFV requirements and have their own file packaging layout, Daisy requires user to always use Kolla image file built by Daisy team. Currently, it can be -got from http://120.24.17.215/. +got from http://120.24.17.215/, or please +see :ref:`this chapter ` +for how to build your own image. 2. Put new version file into /var/lib/daisy/versionfile/kolla/, for example: -- cgit 1.2.3-korg