Add octopus repository on W+ releases

This patch adds the Ceph octopus repository when the release
is W+; this is a requirement to be able to install the cephadm
package on the overcloud images.

Change-Id: If56c388d8283c93ae8bcb2af3e775d8f6d19b704
This commit is contained in:
Francesco Pantano 2020-12-11 09:17:31 +01:00
parent b1cf0c3efb
commit 3965582799
No known key found for this signature in database
GPG Key ID: 799868C47301D458
2 changed files with 7 additions and 2 deletions

View File

@ -404,8 +404,10 @@ def _install_repos(args, base_path):
content = _create_ceph(args, 'jewel')
elif args.branch in ['queens', 'rocky']:
content = _create_ceph(args, 'luminous')
else:
elif args.branch in ['stein', 'train', 'ussuri', 'victoria']:
content = _create_ceph(args, 'nautilus')
else:
content = _create_ceph(args, 'octopus')
_write_repo(content, args.output_path)
elif repo == 'opstools':
content = OPSTOOLS_REPO_TEMPLATE % {'mirror': args.mirror}

View File

@ -305,7 +305,10 @@ class TestTripleORepos(testtools.TestCase):
'queens': 'luminous',
'rocky': 'luminous',
'stein': 'nautilus',
'master': 'nautilus',
'train': 'nautilus',
'ussuri': 'nautilus',
'victoria': 'nautilus',
'master': 'octopus',
}
args = mock.Mock()
args.repos = ['ceph']