Revert "Restrict usage of controller and osd role on single host"
This reverts commit b433ee89f0
.
Change-Id: I3cae65e2f54be550656c79c918a72ea60c3b0ac4
Closes-Bug: 1631878
This commit is contained in:
parent
28b2b985e7
commit
b0e9d4f1aa
|
@ -13,7 +13,6 @@
|
|||
weight: 10
|
||||
conflicts:
|
||||
- compute
|
||||
- ceph-osd
|
||||
update_required:
|
||||
- compute
|
||||
- cinder
|
||||
|
|
|
@ -1622,9 +1622,8 @@ class TestHandlers(BaseIntegrationTest):
|
|||
def test_occurs_error_not_enough_osds_for_ceph(self):
|
||||
cluster = self.env.create(
|
||||
nodes_kwargs=[
|
||||
{'roles': ['controller'], 'pending_addition': True},
|
||||
{'roles': ['ceph-osd'], 'pending_addition': True}
|
||||
])
|
||||
{'roles': ['controller', 'ceph-osd'],
|
||||
'pending_addition': True}])
|
||||
|
||||
self.app.patch(
|
||||
reverse(
|
||||
|
@ -1691,10 +1690,8 @@ class TestHandlers(BaseIntegrationTest):
|
|||
def test_enough_osds_for_ceph(self):
|
||||
cluster = self.env.create(
|
||||
nodes_kwargs=[
|
||||
{'roles': ['controller'], 'pending_addition': True},
|
||||
{'roles': ['ceph-osd'], 'pending_addition': True},
|
||||
])
|
||||
|
||||
{'roles': ['controller', 'ceph-osd'],
|
||||
'pending_addition': True}])
|
||||
self.app.patch(
|
||||
reverse(
|
||||
'ClusterAttributesHandler',
|
||||
|
|
|
@ -257,7 +257,7 @@ class TestTaskDeploy80(BaseIntegrationTest):
|
|||
task.message)
|
||||
|
||||
def test_deploy_check_failed_with_incompatible_role(self):
|
||||
node = self.env.nodes[1]
|
||||
node = self.env.nodes[0]
|
||||
|
||||
self.app.put(
|
||||
reverse(
|
||||
|
|
Loading…
Reference in New Issue