]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32149 into master
authorSage Weil <sage@redhat.com>
Tue, 17 Dec 2019 20:21:48 +0000 (14:21 -0600)
committerSage Weil <sage@redhat.com>
Tue, 17 Dec 2019 20:21:48 +0000 (14:21 -0600)
* refs/pull/32149/head:
mgr/orchestrator: Rename PlacementSpec.nodes -> PlacementSpec.hosts
mgr/ansible: Added missing type annotations
mgr/orchestrator: Add __str__ to HostSpec
mgr/ansible: Integrate mgr/ansible/tox into mgr/tox

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/orchestrator_cli/module.py

Simple merge
index 56d264ec136eda2392b913c039db2082cef1900f,ef101061dcb84433e4d05892fb13831e88a3f00b..76cdc97a56bbf933985ab736c9af1347d7907b01
@@@ -438,11 -434,11 +438,11 @@@ Usage
          'orchestrator mds update',
          "name=fs_name,type=CephString "
          "name=num,type=CephInt,req=false "
 -        "name=label,type=CephString,req=false",
          "name=hosts,type=CephString,n=N,req=false "
 +        "name=label,type=CephString,req=false",
          'Update the number of MDS instances for the given fs_name')
      def _mds_update(self, fs_name, num=None, label=None, hosts=[]):
-         placement = orchestrator.PlacementSpec(label=label, count=num, nodes=hosts)
+         placement = orchestrator.PlacementSpec(label=label, count=num, hosts=hosts)
          placement.validate()
  
          spec = orchestrator.StatelessServiceSpec(