diff --git a/plugins/module_utils/tripleo_repos/main.py b/plugins/module_utils/tripleo_repos/main.py index 3c1b305..a764248 100755 --- a/plugins/module_utils/tripleo_repos/main.py +++ b/plugins/module_utils/tripleo_repos/main.py @@ -53,6 +53,13 @@ baseurl=%(mirror)s/centos/%(centos_release)s/storage/$basearch/ceph-%(ceph_relea gpgcheck=0 enabled=1 ''' +CEPH_SIG_REPO_TEMPLATE = ''' +[tripleo-centos-ceph-%(ceph_release)s] +name=tripleo-centos-ceph-%(ceph_release)s +baseurl=%(mirror)s/SIGs/%(centos_release)s/storage/$basearch/ceph-%(ceph_release)s/ +gpgcheck=0 +enabled=1 +''' OPSTOOLS_REPO_TEMPLATE = ''' [tripleo-centos-opstools] name=tripleo-centos-opstools @@ -392,10 +399,18 @@ def _install_priorities(): def _create_ceph(args, release): """Generate a Ceph repo file for release""" - centos_release = '7' if args.distro == 'centos7' else '8' - return CEPH_REPO_TEMPLATE % {'centos_release': centos_release, - 'ceph_release': release, - 'mirror': args.mirror} + centos_release = '9-stream' + template = CEPH_SIG_REPO_TEMPLATE + if args.distro == 'centos7': + centos_release = '7' + template = CEPH_REPO_TEMPLATE + elif args.distro == 'centos8': + centos_release = '8-stream' + template = CEPH_REPO_TEMPLATE + + return template % {'centos_release': centos_release, + 'ceph_release': release, + 'mirror': args.mirror} def _change_priority(content, new_priority): diff --git a/tests/unit/tripleo_repos/test_main.py b/tests/unit/tripleo_repos/test_main.py index ae7ea4e..75ec983 100644 --- a/tests/unit/tripleo_repos/test_main.py +++ b/tests/unit/tripleo_repos/test_main.py @@ -590,7 +590,18 @@ enabled=1 expected_repo = ''' [tripleo-centos-ceph-jewel] name=tripleo-centos-ceph-jewel -baseurl=http://foo/centos/8/storage/$basearch/ceph-jewel/ +baseurl=http://foo/SIGs/9-stream/storage/$basearch/ceph-jewel/ +gpgcheck=0 +enabled=1 +''' + self.assertEqual(expected_repo, result) + + mock_args = mock.Mock(mirror='http://foo', distro='centos8') + result = main._create_ceph(mock_args, 'jewel') + expected_repo = ''' +[tripleo-centos-ceph-jewel] +name=tripleo-centos-ceph-jewel +baseurl=http://foo/centos/8-stream/storage/$basearch/ceph-jewel/ gpgcheck=0 enabled=1 '''