Merge "Add security repository into default set of repos" into stable/6.1
This commit is contained in:
commit
ec0a2b8ee4
@ -1219,6 +1219,10 @@
|
||||
name: "mos-updates"
|
||||
uri: "http://mirror.fuel-infra.org/mos/centos-6/mos6.1/updates"
|
||||
priority: null
|
||||
- type: "rpm"
|
||||
name: "mos-security"
|
||||
uri: "http://mirror.fuel-infra.org/mos/centos-6/mos6.1/security"
|
||||
priority: null
|
||||
- type: "rpm"
|
||||
name: "Auxiliary"
|
||||
uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/centos/auxiliary"
|
||||
|
@ -467,6 +467,13 @@ class TestAlwaysEditable(BaseIntegrationTest):
|
||||
'updates',
|
||||
'priority': None,
|
||||
},
|
||||
{
|
||||
'type': 'rpm',
|
||||
'name': 'mos-security',
|
||||
'uri': 'http://mirror.fuel-infra.org/mos/centos-6/mos6.1/'
|
||||
'security',
|
||||
'priority': None,
|
||||
},
|
||||
{
|
||||
'type': 'rpm',
|
||||
'name': 'Auxiliary',
|
||||
|
@ -139,13 +139,14 @@ class TestHooksSerializers(BaseTaskSerializationTest):
|
||||
task = tasks_serializer.UploadMOSRepo(
|
||||
task_config, self.cluster, self.nodes)
|
||||
serialized = list(task.serialize())
|
||||
self.assertEqual(len(serialized), 4)
|
||||
self.assertEqual(len(serialized), 5)
|
||||
self.assertEqual(serialized[0]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[1]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[2]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[3]['type'], 'shell')
|
||||
self.assertEqual(serialized[3]['parameters']['cmd'], 'yum clean all')
|
||||
self.assertItemsEqual(serialized[3]['uids'], self.all_uids)
|
||||
self.assertEqual(serialized[3]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[4]['type'], 'shell')
|
||||
self.assertEqual(serialized[4]['parameters']['cmd'], 'yum clean all')
|
||||
self.assertItemsEqual(serialized[4]['uids'], self.all_uids)
|
||||
|
||||
def test_serialize_rados_with_ceph(self):
|
||||
task_config = {'id': 'restart_radosgw',
|
||||
|
Loading…
Reference in New Issue
Block a user