From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Dec 2019 20:21:48 +0000 (-0600)
Subject: Merge PR #32149 into master
X-Git-Tag: v15.1.0~450
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a60062a24f91ed1e9e61cbe5eff3257f631fbaef;p=ceph.git

Merge PR #32149 into master

* 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>
---

a60062a24f91ed1e9e61cbe5eff3257f631fbaef
diff --cc src/pybind/mgr/orchestrator_cli/module.py
index 56d264ec136,ef101061dcb..76cdc97a56b
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@@ -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(