diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-27 12:23:52 -0700 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-27 12:23:52 -0700 |
commit | 867a3efa905945342a83312c6b7e2cb8b09ee51e (patch) | |
tree | 567ab014e82e60c48a679637a3e7a383a0744d4d /src/lib/Bcfg2 | |
parent | 1f0fa73a04a68146cbe3527d5748b82bdb4e5b1e (diff) | |
parent | 76165d797e9dc0ef4741c0faf42c8586543d3558 (diff) | |
download | bcfg2-867a3efa905945342a83312c6b7e2cb8b09ee51e.tar.gz bcfg2-867a3efa905945342a83312c6b7e2cb8b09ee51e.tar.bz2 bcfg2-867a3efa905945342a83312c6b7e2cb8b09ee51e.zip |
Merge pull request #138 from kincl/fix-query-clients-list
Metadata: Fix client list calls use list_clients() which is DB-aware instead of just self.clients
Diffstat (limited to 'src/lib/Bcfg2')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index 54440605e..ece852ad7 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -547,7 +547,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata, self.pdirty = False self.password = core.setup['password'] self.query = MetadataQuery(core.build_metadata, - lambda: list(self.clients), + self.list_clients, self.get_client_names_by_groups, self.get_client_names_by_profiles, self.get_all_group_names, @@ -1274,7 +1274,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata, def get_client_names_by_profiles(self, profiles): """ return a list of names of clients in the given profile groups """ rv = [] - for client in list(self.clients): + for client in list(self.list_clients()): mdata = self.core.build_metadata(client) if mdata.profile in profiles: rv.append(client) @@ -1282,13 +1282,13 @@ class Metadata(Bcfg2.Server.Plugin.Metadata, def get_client_names_by_groups(self, groups): """ return a list of names of clients in the given groups """ - mdata = [self.core.build_metadata(client) for client in self.clients] + mdata = [self.core.build_metadata(client) for client in self.list_clients()] return [md.hostname for md in mdata if md.groups.issuperset(groups)] def get_client_names_by_bundles(self, bundles): """ given a list of bundles, return a list of names of clients that use those bundles """ - mdata = [self.core.build_metadata(client) for client in self.clients] + mdata = [self.core.build_metadata(client) for client in self.list_clients()] return [md.hostname for md in mdata if md.bundles.issuperset(bundles)] def merge_additional_groups(self, imd, groups): @@ -1462,7 +1462,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata, instances = {} rv = [] - for client in list(self.clients): + for client in list(self.list_clients()): if not include_client(client): continue if client in self.clientgroups: |