Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392980 )
Change subject: horizon pupettab: Handle the user passing in an empty hiera
block
......................................................................
horizon pupettab: Handle the user passing in an empty hiera block
Bug: T181196
Change-Id: I5a142fb439e2c9b9e571fa105e444addcd2e755d
---
M modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/392980/1
diff --git a/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
b/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
index 671d335..5dffc20 100644
--- a/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
+++ b/modules/openstack/files/mitaka/horizon/puppettab/puppet_config.py
@@ -176,8 +176,11 @@
def set_roleless_hiera(self, hiera_yaml):
# Add role-associated hiera params to this freeform block before
# sending it on to the backend
+ if not hiera_yaml:
+ hiera_yaml = {}
raw_hiera_yaml = yaml.safe_load(self.hiera_raw)
+
if not raw_hiera_yaml:
raw_hiera_yaml = {}
allrole_dict = {role.name: role for role in self.allroles}
--
To view, visit https://gerrit.wikimedia.org/r/392980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a142fb439e2c9b9e571fa105e444addcd2e755d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
