openstack
/
tripleo-common
Code Issues Proposed changes

Update default Ceph container image to use to the Nautilus version 

From the OpenStack Stein release we want to deploy the Ceph Nautilus
version; this change updates the default container image to use accoringly.

Depends-On: Id0de75e7459b9a8d993a87552b51cf6fdbd29687
Change-Id: I133cd0cd632e0ba6b5a844a89bf74a063cf50f07
This commit is contained in:
Giulio Fidente 2019-04-09 18:10:21 +02:00
parent 609e527ed2
commit 05a1f1fad2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/container_image_prepare_defaults.yaml
View File

@ -27,7 +27,7 @@ parameter_defaults:
# Only used if Ceph is deployed.
ceph_namespace: docker.io/ceph
ceph_image: daemon
ceph_tag: v3.2.1-stable-3.2-luminous-centos-7-x86_64
ceph_tag: v4.0.0-stable-4.0-nautilus-centos-7-x86_64
# Container image name components for OpenShift images.
# Only used if OpenShift is deployed.

2
container-images/overcloud_containers.yaml
View File

@ -203,7 +203,7 @@ container_images:
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-zaqar-wsgi:current-tripleo
image_source: kolla
- imagename: docker.io/ceph/daemon:v3.2.1-stable-3.2-luminous-centos-7-x86_64
- imagename: docker.io/ceph/daemon:v4.0.0-stable-4.0-nautilus-centos-7-x86_64
image_source: ceph
- imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo
image_source: kolla

4
container-images/tripleo_kolla_template_overrides.j2
View File

@ -19,8 +19,8 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
{% endblock %}
# Remove EPEL and the dependencies requiring it
{% set base_centos_yum_repo_packages_remove = ['epel-release', 'centos-release-ceph-jewel'] %}
{% set base_centos_yum_repo_packages_append = ['centos-release-ceph-luminous', 'centos-release-opstools'] %}
{% set base_centos_yum_repo_packages_remove = ['epel-release', 'centos-release-ceph-jewel', 'centos-release-ceph-luminous'] %}
{% set base_centos_yum_repo_packages_append = ['centos-release-ceph-nautilus', 'centos-release-opstools'] %}
{% set base_centos_binary_packages_remove = ['scsi-target-utils'] %}
{% set cinder_volume_packages_remove = ['scsi-target-utils'] %}
{% set ironic_conductor_packages_remove = ['shellinabox'] %}

2
tripleo_common/tests/image/test_kolla_builder.py
View File

@ -237,7 +237,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'namespace': 'docker.io/tripleomaster',
'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'v3.2.1-stable-3.2-luminous-centos-7-x86_64',
'ceph_tag': 'v4.0.0-stable-4.0-nautilus-centos-7-x86_64',
'name_prefix': 'centos-binary-',
'name_suffix': '',
'tag': 'current-tripleo',