summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-26 10:26:34 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-26 10:26:34 -0400
commit00317c9a97694ec5cf610e1c319260d63abc8eba (patch)
tree42ee27e87f989e35235c00ca4469171def23caa1 /src
parentf22ad439539c85ab32daf04bdfa88fca6adaf6da (diff)
downloadbcfg2-00317c9a97694ec5cf610e1c319260d63abc8eba.tar.gz
bcfg2-00317c9a97694ec5cf610e1c319260d63abc8eba.tar.bz2
bcfg2-00317c9a97694ec5cf610e1c319260d63abc8eba.zip
Metadata: apply default group consistently on first and subsequent client runs
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Metadata.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index 41d65a7bd..2cb72286e 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -1144,6 +1144,11 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
if not profile and self.groups[cgroup].is_profile:
profile = cgroup
+ if not len(groups) and self.default:
+ # no initial groups; add the default profile
+ profile = self.default
+ groups.add(self.default)
+
groups, categories = self._merge_groups(client, groups,
categories=categories)