diff --git a/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json b/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json index 5612a310b3..67eb80f960 100644 --- a/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json +++ b/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json @@ -9,13 +9,6 @@ "updated_at": null } }, - "consoleauth": { - "nova-consoleauth": { - "active": true, - "available": true, - "updated_at": null - } - }, "network": { "nova-network": { "active": true, diff --git a/doc/api_samples/os-hosts/hosts-list-resp.json b/doc/api_samples/os-hosts/hosts-list-resp.json index 1413b3aabd..449cbfa5a1 100644 --- a/doc/api_samples/os-hosts/hosts-list-resp.json +++ b/doc/api_samples/os-hosts/hosts-list-resp.json @@ -10,11 +10,6 @@ "service": "compute", "zone": "nova" }, - { - "host_name": "e73ec0bd35c64de4a1adfa8b8969a1f6", - "service": "consoleauth", - "zone": "internal" - }, { "host_name": "396a8a0a234f476eb05fb9fbc5802ba7", "service": "network", diff --git a/doc/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json b/doc/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json index 267e9d5099..767e2e7bc5 100644 --- a/doc/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json +++ b/doc/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json @@ -33,7 +33,7 @@ "running_vms": 0, "service": { "host": "host1", - "id": 7, + "id": 6, "disabled_reason": null }, "vcpus": 2, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl index 0ed71fe74d..ce76bb4856 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl @@ -2,13 +2,6 @@ "availabilityZoneInfo": [ { "hosts": { - "consoleauth": { - "nova-consoleauth": { - "active": true, - "available": true, - "updated_at": %(strtime_or_none)s - } - }, "conductor": { "nova-conductor": { "active": true, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl index bbf2dba785..cf4ebd5dfc 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl @@ -10,11 +10,6 @@ "service": "compute", "zone": "nova" }, - { - "host_name": "%(host_name)s", - "service": "consoleauth", - "zone": "internal" - }, { "host_name": "%(host_name)s", "service": "network", diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json.tpl index 718246b0b8..0cf1745bf3 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json.tpl @@ -33,7 +33,7 @@ "running_vms": 0, "service": { "host": "%(host_name)s", - "id": 7, + "id": 6, "disabled_reason": null }, "vcpus": 2, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/availability-zone-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/availability-zone-detail-resp.json.tpl index ec71675e4f..67eb80f960 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/availability-zone-detail-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/availability-zone-detail-resp.json.tpl @@ -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 @@ } } ] -} \ No newline at end of file +} diff --git a/nova/tests/functional/integrated_helpers.py b/nova/tests/functional/integrated_helpers.py index cdad4dfe37..821305729f 100644 --- a/nova/tests/functional/integrated_helpers.py +++ b/nova/tests/functional/integrated_helpers.py @@ -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)) diff --git a/nova/tests/functional/regressions/test_bug_1548980.py b/nova/tests/functional/regressions/test_bug_1548980.py index cea688f7de..9aa4d358b6 100644 --- a/nova/tests/functional/regressions/test_bug_1548980.py +++ b/nova/tests/functional/regressions/test_bug_1548980.py @@ -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) diff --git a/nova/tests/functional/regressions/test_bug_1595962.py b/nova/tests/functional/regressions/test_bug_1595962.py index 06004159b4..361108cb85 100644 --- a/nova/tests/functional/regressions/test_bug_1595962.py +++ b/nova/tests/functional/regressions/test_bug_1595962.py @@ -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) diff --git a/nova/tests/functional/regressions/test_bug_1670627.py b/nova/tests/functional/regressions/test_bug_1670627.py index de970628c7..4c01c01ac3 100644 --- a/nova/tests/functional/regressions/test_bug_1670627.py +++ b/nova/tests/functional/regressions/test_bug_1670627.py @@ -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 diff --git a/nova/tests/functional/regressions/test_bug_1671648.py b/nova/tests/functional/regressions/test_bug_1671648.py index ce1ffb500a..d57b5a55f1 100644 --- a/nova/tests/functional/regressions/test_bug_1671648.py +++ b/nova/tests/functional/regressions/test_bug_1671648.py @@ -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. diff --git a/nova/tests/functional/regressions/test_bug_1675570.py b/nova/tests/functional/regressions/test_bug_1675570.py index 8aade45f7c..b3fd2344c5 100644 --- a/nova/tests/functional/regressions/test_bug_1675570.py +++ b/nova/tests/functional/regressions/test_bug_1675570.py @@ -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)) diff --git a/nova/tests/functional/regressions/test_bug_1679750.py b/nova/tests/functional/regressions/test_bug_1679750.py index 581108e3a1..0d3e7e1d74 100644 --- a/nova/tests/functional/regressions/test_bug_1679750.py +++ b/nova/tests/functional/regressions/test_bug_1679750.py @@ -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') diff --git a/nova/tests/functional/regressions/test_bug_1682693.py b/nova/tests/functional/regressions/test_bug_1682693.py index 7df7b113d2..6f466c1b58 100644 --- a/nova/tests/functional/regressions/test_bug_1682693.py +++ b/nova/tests/functional/regressions/test_bug_1682693.py @@ -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 = [] diff --git a/nova/tests/functional/regressions/test_bug_1689692.py b/nova/tests/functional/regressions/test_bug_1689692.py index 5c9d137ae2..1b6cf48d83 100644 --- a/nova/tests/functional/regressions/test_bug_1689692.py +++ b/nova/tests/functional/regressions/test_bug_1689692.py @@ -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)) diff --git a/nova/tests/functional/regressions/test_bug_1702454.py b/nova/tests/functional/regressions/test_bug_1702454.py index 6724a9a4a6..2aa5d81b74 100644 --- a/nova/tests/functional/regressions/test_bug_1702454.py +++ b/nova/tests/functional/regressions/test_bug_1702454.py @@ -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') diff --git a/nova/tests/functional/regressions/test_bug_1718512.py b/nova/tests/functional/regressions/test_bug_1718512.py index 9786f1b71c..b24b872546 100644 --- a/nova/tests/functional/regressions/test_bug_1718512.py +++ b/nova/tests/functional/regressions/test_bug_1718512.py @@ -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'], diff --git a/nova/tests/functional/test_list_servers_ip_filter.py b/nova/tests/functional/test_list_servers_ip_filter.py index b52242f85e..e3bba53e3b 100644 --- a/nova/tests/functional/test_list_servers_ip_filter.py +++ b/nova/tests/functional/test_list_servers_ip_filter.py @@ -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))