|
6 | 6 | __metaclass__ = type
|
7 | 7 |
|
8 | 8 | DOCUMENTATION = """
|
9 |
| - name: nb_inventory |
| 9 | + name: nb_inventory |
10 | 10 | author:
|
11 | 11 | - Remy Leone (@sieben)
|
12 | 12 | - Anthony Ruhier (@Anthony25)
|
@@ -1668,11 +1668,12 @@ def generate_group_name(self, grouping, group):
|
1668 | 1668 |
|
1669 | 1669 | def add_host_to_groups(self, host, hostname):
|
1670 | 1670 | site_group_by = self._pluralize_group_by("site")
|
| 1671 | + site_group_group_by = self._pluralize_group_by("site_group") |
1671 | 1672 |
|
1672 | 1673 | for grouping in self.group_by:
|
1673 | 1674 | # Don't handle regions here since no hosts are ever added to region groups
|
1674 | 1675 | # Sites and locations are also specially handled in the main()
|
1675 |
| - if grouping in ["region", site_group_by, "location", "site_group"]: |
| 1676 | + if grouping in ["region", site_group_by, "location", site_group_group_by]: |
1676 | 1677 | continue
|
1677 | 1678 |
|
1678 | 1679 | if grouping not in self.group_extractors:
|
@@ -1892,11 +1893,12 @@ def main(self):
|
1892 | 1893 | # - the location groups are added as sub-groups of sites
|
1893 | 1894 | # So, we need to make sure we're also grouping by sites if regions or locations are enabled
|
1894 | 1895 | site_group_by = self._pluralize_group_by("site")
|
| 1896 | + site_group_group_by = self._pluralize_group_by("site") |
1895 | 1897 | if (
|
1896 | 1898 | site_group_by in self.group_by
|
1897 | 1899 | or "location" in self.group_by
|
1898 | 1900 | or "region" in self.group_by
|
1899 |
| - or "site_group" in self.group_by |
| 1901 | + or site_group_group_by in self.group_by |
1900 | 1902 | ):
|
1901 | 1903 | self._add_site_groups()
|
1902 | 1904 |
|
|
0 commit comments