tests: Stop starting consoleauth in functional tests
This hasn't been needed since we moved console authentication to the database in Rocky. Part of blueprint remove-consoleauth Change-Id: Ie5e7d70f9d6af77edd22756128937f06d0b961a9 Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
parent
009fd0f35b
commit
8f6de35636
@ -9,13 +9,6 @@
|
||||
"updated_at": null
|
||||
}
|
||||
},
|
||||
"consoleauth": {
|
||||
"nova-consoleauth": {
|
||||
"active": true,
|
||||
"available": true,
|
||||
"updated_at": null
|
||||
}
|
||||
},
|
||||
"network": {
|
||||
"nova-network": {
|
||||
"active": true,
|
||||
|
@ -10,11 +10,6 @@
|
||||
"service": "compute",
|
||||
"zone": "nova"
|
||||
},
|
||||
{
|
||||
"host_name": "e73ec0bd35c64de4a1adfa8b8969a1f6",
|
||||
"service": "consoleauth",
|
||||
"zone": "internal"
|
||||
},
|
||||
{
|
||||
"host_name": "396a8a0a234f476eb05fb9fbc5802ba7",
|
||||
"service": "network",
|
||||
|
@ -33,7 +33,7 @@
|
||||
"running_vms": 0,
|
||||
"service": {
|
||||
"host": "host1",
|
||||
"id": 7,
|
||||
"id": 6,
|
||||
"disabled_reason": null
|
||||
},
|
||||
"vcpus": 2,
|
||||
|
@ -2,13 +2,6 @@
|
||||
"availabilityZoneInfo": [
|
||||
{
|
||||
"hosts": {
|
||||
"consoleauth": {
|
||||
"nova-consoleauth": {
|
||||
"active": true,
|
||||
"available": true,
|
||||
"updated_at": %(strtime_or_none)s
|
||||
}
|
||||
},
|
||||
"conductor": {
|
||||
"nova-conductor": {
|
||||
"active": true,
|
||||
|
@ -10,11 +10,6 @@
|
||||
"service": "compute",
|
||||
"zone": "nova"
|
||||
},
|
||||
{
|
||||
"host_name": "%(host_name)s",
|
||||
"service": "consoleauth",
|
||||
"zone": "internal"
|
||||
},
|
||||
{
|
||||
"host_name": "%(host_name)s",
|
||||
"service": "network",
|
||||
|
@ -33,7 +33,7 @@
|
||||
"running_vms": 0,
|
||||
"service": {
|
||||
"host": "%(host_name)s",
|
||||
"id": 7,
|
||||
"id": 6,
|
||||
"disabled_reason": null
|
||||
},
|
||||
"vcpus": 2,
|
||||
|
@ -9,13 +9,6 @@
|
||||
"updated_at": null
|
||||
}
|
||||
},
|
||||
"consoleauth": {
|
||||
"nova-consoleauth": {
|
||||
"active": true,
|
||||
"available": true,
|
||||
"updated_at": null
|
||||
}
|
||||
},
|
||||
"network": {
|
||||
"nova-network": {
|
||||
"active": true,
|
||||
@ -52,4 +45,4 @@
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@ -116,7 +116,6 @@ class _IntegratedTestBase(test.TestCase):
|
||||
if 'cell1' in self.cell_mappings:
|
||||
self.flags(transport_url=self.cell_mappings['cell1'].transport_url)
|
||||
self.conductor = self.start_service('conductor')
|
||||
self.consoleauth = self.start_service('consoleauth')
|
||||
|
||||
if self.USE_NEUTRON:
|
||||
self.neutron = self.useFixture(nova_fixtures.NeutronFixture(self))
|
||||
|
@ -48,7 +48,6 @@ class TestServerGet(test.TestCase):
|
||||
self.start_service('conductor')
|
||||
self.start_service('scheduler')
|
||||
self.compute = self.start_service('compute')
|
||||
self.consoleauth = self.start_service('consoleauth')
|
||||
|
||||
self.useFixture(cast_as_call.CastAsCall(self))
|
||||
self.addCleanup(nova.tests.unit.image.fake.FakeImageService_reset)
|
||||
|
@ -69,7 +69,6 @@ class TestSerialConsoleLiveMigrate(test.TestCase):
|
||||
self.start_service('conductor')
|
||||
self.start_service('scheduler')
|
||||
self.compute = self.start_service('compute', host='test_compute1')
|
||||
self.consoleauth = self.start_service('consoleauth')
|
||||
|
||||
self.useFixture(cast_as_call.CastAsCall(self))
|
||||
self.addCleanup(nova.tests.unit.image.fake.FakeImageService_reset)
|
||||
|
@ -59,7 +59,6 @@ class TestDeleteFromCell0CheckQuota(test.TestCase):
|
||||
|
||||
self.start_service('conductor')
|
||||
self.start_service('scheduler')
|
||||
self.start_service('consoleauth')
|
||||
|
||||
# We don't actually start a compute service; this way we don't have any
|
||||
# compute hosts to schedule the instance to and will go into error and
|
||||
|
@ -63,7 +63,6 @@ class TestRetryBetweenComputeNodeBuilds(test.TestCase):
|
||||
nova.tests.unit.image.fake.stub_out_image_service(self)
|
||||
|
||||
self.start_service('conductor')
|
||||
self.start_service('consoleauth')
|
||||
|
||||
# We start two compute services because we're going to fake one
|
||||
# of them to fail the build so we can trigger the retry code.
|
||||
|
@ -70,8 +70,6 @@ class TestLocalDeleteAttachedVolumes(test.TestCase):
|
||||
self.start_service('conductor')
|
||||
self.start_service('scheduler')
|
||||
self.start_service('compute')
|
||||
# The consoleauth service is needed for deleting console tokens.
|
||||
self.start_service('consoleauth')
|
||||
|
||||
self.useFixture(cast_as_call.CastAsCall(self))
|
||||
|
||||
|
@ -40,7 +40,6 @@ class TestLocalDeleteAllocations(test.TestCase,
|
||||
nova.tests.unit.image.fake.stub_out_image_service(self)
|
||||
|
||||
self.start_service('conductor')
|
||||
self.start_service('consoleauth')
|
||||
|
||||
self.start_service('scheduler')
|
||||
|
||||
|
@ -53,9 +53,6 @@ class ServerTagsFilteringTest(test.TestCase,
|
||||
self.start_service('conductor')
|
||||
self.start_service('scheduler')
|
||||
self.start_service('compute')
|
||||
# The consoleauth service is needed for deleting console tokens when
|
||||
# the server is deleted.
|
||||
self.start_service('consoleauth')
|
||||
|
||||
# create two test servers
|
||||
self.servers = []
|
||||
|
@ -53,7 +53,6 @@ class ServerListLimitMarkerCell0Test(test.TestCase,
|
||||
|
||||
self.start_service('conductor')
|
||||
self.start_service('scheduler')
|
||||
self.start_service('consoleauth')
|
||||
# We don't start the compute service because we want NoValidHost so
|
||||
# all of the instances go into ERROR state and get put into cell0.
|
||||
self.useFixture(cast_as_call.CastAsCall(self))
|
||||
|
@ -83,10 +83,6 @@ class SchedulerOnlyChecksTargetTest(test.TestCase,
|
||||
self.admin_api.microversion = 'latest'
|
||||
self.api.microversion = 'latest'
|
||||
|
||||
# The consoleauth service is needed for deleting console tokens when
|
||||
# the server is deleted.
|
||||
self.start_service('consoleauth')
|
||||
|
||||
# Define a very basic scheduler that only verifies if host is down.
|
||||
self.flags(enabled_filters=['ComputeFilter'],
|
||||
group='filter_scheduler')
|
||||
|
@ -75,10 +75,6 @@ class TestRequestSpecRetryReschedule(test.TestCase,
|
||||
self.admin_api.microversion = 'latest'
|
||||
self.api.microversion = 'latest'
|
||||
|
||||
# The consoleauth service is needed for deleting console tokens when
|
||||
# the server is deleted.
|
||||
self.start_service('consoleauth')
|
||||
|
||||
# Use our custom weigher defined above to make sure that we have
|
||||
# a predictable scheduling sort order.
|
||||
self.flags(weight_classes=[__name__ + '.HostNameWeigher'],
|
||||
|
@ -47,7 +47,6 @@ class TestListServersIpFilter(test.TestCase):
|
||||
group='filter_scheduler')
|
||||
self.start_service('scheduler')
|
||||
self.start_service('compute')
|
||||
self.start_service('consoleauth')
|
||||
|
||||
self.useFixture(cast_as_call.CastAsCall(self))
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user