Browse Source

Merge "Switch default images to py3"

tags/13.2.0
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
0379179dfd
3 changed files with 9 additions and 3 deletions
  1. +5
    -0
      releasenotes/notes/switch-overcloud-images-to-centos8-df7cb0c197f646e4.yaml
  2. +2
    -2
      tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py
  3. +2
    -1
      tripleoclient/v1/overcloud_image.py

+ 5
- 0
releasenotes/notes/switch-overcloud-images-to-centos8-df7cb0c197f646e4.yaml View File

@@ -0,0 +1,5 @@
---
features:
- |
Starting with "Ussuri", the default images that are built when running
the `openstack overcloud image build` action are python3 and centos8 based.

+ 2
- 2
tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py View File

@@ -45,9 +45,9 @@ class TestOvercloudImageBuild(TestPluginV1):

mock_manager.assert_called_once_with(
['/usr/share/openstack-tripleo-common/image-yaml/'
'overcloud-images.yaml',
'overcloud-images-python3.yaml',
'/usr/share/openstack-tripleo-common/image-yaml/'
'overcloud-images-centos7.yaml'],
'overcloud-images-centos8.yaml'],
output_directory='.',
skip=True,
images=None)


+ 2
- 1
tripleoclient/v1/overcloud_image.py View File

@@ -44,7 +44,8 @@ class BuildOvercloudImage(command.Command):
log = logging.getLogger(__name__ + ".BuildOvercloudImage")

IMAGE_YAML_PATH = "/usr/share/openstack-tripleo-common/image-yaml"
DEFAULT_YAML = ['overcloud-images.yaml', 'overcloud-images-centos7.yaml']
DEFAULT_YAML = ['overcloud-images-python3.yaml',
'overcloud-images-centos8.yaml']

def get_parser(self, prog_name):
parser = super(BuildOvercloudImage, self).get_parser(prog_name)


Loading…
Cancel
Save