From e4f019a5ddfca68c7f0ac5cbfdeb47e88e170d20 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 29 Sep 2021 16:39:40 +0100 Subject: Build source type images by default Source images get the most test coverage, so it makes sense to build these by default. Change-Id: Ie10a41a94af95075a1b91feb2b74ade02b17117e --- doc/source/admin/image-building.rst | 4 ++-- kolla/common/config.py | 2 +- releasenotes/notes/default-type-source-f0c5cf1d97e2f345.yaml | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/default-type-source-f0c5cf1d97e2f345.yaml diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst index f5a110a7a..00281e5c1 100644 --- a/doc/source/admin/image-building.rst +++ b/doc/source/admin/image-building.rst @@ -118,11 +118,11 @@ When building images, there are two methods of the OpenStack install. One is ``binary``. Another is ``source``. The ``binary`` means that OpenStack will be installed from apt/dnf. And the ``source`` means that OpenStack will be installed from upstream sources. The default method of the OpenStack install is -``binary``. It can be changed to ``source`` using the ``-t`` option: +``source``. It can be changed to ``binary`` using the ``-t`` option: .. code-block:: console - kolla-build -t source + kolla-build -t binary The locations of OpenStack source code are written in ``kolla-build.conf``. The source type supports ``url``, ``git``, and ``local``. The location of diff --git a/kolla/common/config.py b/kolla/common/config.py index e08a84415..b8f9a4661 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -203,7 +203,7 @@ _CLI_OPTS = [ help='Format to write the final results in'), cfg.StrOpt('tarballs-base', default=TARBALLS_BASE, help='Base url to OpenStack tarballs'), - cfg.StrOpt('type', short='t', default='binary', + cfg.StrOpt('type', short='t', default='source', choices=INSTALL_TYPE_CHOICES, dest='install_type', help=('The method of the OpenStack install.')), diff --git a/releasenotes/notes/default-type-source-f0c5cf1d97e2f345.yaml b/releasenotes/notes/default-type-source-f0c5cf1d97e2f345.yaml new file mode 100644 index 000000000..62a019d67 --- /dev/null +++ b/releasenotes/notes/default-type-source-f0c5cf1d97e2f345.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + Updates the default image type to ``source``. Users wishing to build + ``binary`` type images should either specify the ``--type binary`` CLI + argument or set ``[DEFAULT] type=binary`` in ``kolla-build.conf``. + This change is to reflect the reality that source images are tested more + thoroughly and we (as OpenStack community) have better control over them. -- cgit v1.2.3