diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e6bb0f2003c1ab6a966bbe8438e99e65eda888e1..8ab164caec1d775d3fe005ad216493fba02a89b0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,3 +21,10 @@ Minor Changes - added action plugin `dump_role_vars` +v1.2.0 +====== + +Minor Changes +------------- + +- changed list merge behavior of roles from 'append' to 'replace' diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index b0e4d7496324a63749030ae09388a47f55da428a..11c9489816ec316d59e9910e9f0a65c07171866d 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -11,3 +11,8 @@ releases: minor_changes: - added action plugin `dump_role_vars` release_date: '2021-06-01' + 1.2.0: + changes: + minor_changes: + - changed list merge behavior of roles from 'append' to 'replace' + release_date: '2021-06-08' diff --git a/galaxy.yml b/galaxy.yml index f1339cbd7d8c85afbe446d84670ef0d9f6d5c2d6..0df78c799abd2c23bf15b7a9a001ec3b0b8b1fd9 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -6,7 +6,7 @@ readme: README.md repository: https://gitlab.mn.tu-dresden.de/sdm/sdm.oor.git documentation: https://sdm.mn.tu-dresden.de/references/collections/sdm.oor/ homepage: https://sdm.mn.tu-dresden.de -version: 1.1.0 +version: 1.2.0 authors: - Martin Pietsch <martin.pietsch@tu-dresden.de> - Robin Richter <robin.richter@mailbox.tu-dresden.de> diff --git a/plugins/callback/sdmoor.py b/plugins/callback/sdmoor.py index 93c5d40a677e73d8a0661213b412ecd23bc57055..74f7254c624311b93a7b507670f0a2c2a5c8bba2 100644 --- a/plugins/callback/sdmoor.py +++ b/plugins/callback/sdmoor.py @@ -583,17 +583,17 @@ class SDMRole(Role): self._load_base_role_vars(self._system) try: - self._role_vars = merge_hash(self._base_role_vars.get(self._system, dict()), self._additional_role_vars, recursive=True, list_merge="append") + self._role_vars = merge_hash(self._base_role_vars.get(self._system, dict()), self._additional_role_vars, recursive=True, list_merge="replace") except TypeError: #ansible version 2.9 and older self._role_vars = merge_hash(self._base_role_vars.get(self._system, dict()), self._additional_role_vars) try: - self._default_vars = merge_hash(self._base_default_vars.get(self._system, dict()), self._additional_default_vars, recursive=True, list_merge="append") + self._default_vars = merge_hash(self._base_default_vars.get(self._system, dict()), self._additional_default_vars, recursive=True, list_merge="replace") except TypeError: #ansible version 2.9 and older self._default_vars = merge_hash(self._base_default_vars.get(self._system, dict()), self._additional_default_vars) try: - self._role_vars = merge_hash(self._role_vars, rolehostcache, recursive=True, list_merge="append") + self._role_vars = merge_hash(self._role_vars, rolehostcache, recursive=True, list_merge="replace") except TypeError: #ansible version 2.9 and older self._role_vars = merge_hash(self._role_vars, rolehostcache)