← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily

« back to all changes in this revision

Viewing changes to heat/engine/parameter_groups.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant
  • Date: 2015-08-19 08:11:50 UTC
  • mfrom: (1.1.27)
  • Revision ID: package-import@ubuntu.com-20150819081150-m969fd35xn8bdmfu
Tags: 1:5.0.0~b2-0ubuntu1
* New upstream milestone for OpenStack Liberty.
* d/control: Align (build-)depends with upstream.
* d/p/fix-requirements.patch: Dropped. No longer needed.
* d/p/fixup-assert-regex.patch: Rebased.
* d/rules: Remove .eggs directory in override_dh_auto_clean.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/engine/parameter_groups.py
57
57
                if parameters is None:
58
58
                    raise exception.StackValidationFailed(
59
59
                        error=_('Parameter Groups error'),
60
 
                        path=[PARAMETER_GROUPS, group.get('label')],
 
60
                        path=[PARAMETER_GROUPS, group.get('label', '')],
61
61
                        message=_('The %s must be provided for '
62
62
                                  'each parameter group.') % PARAMETERS)
63
63
 
64
64
                if not isinstance(parameters, list):
65
65
                    raise exception.StackValidationFailed(
66
66
                        error=_('Parameter Groups error'),
67
 
                        path=[PARAMETER_GROUPS, group.get('label')],
 
67
                        path=[PARAMETER_GROUPS, group.get('label', '')],
68
68
                        message=_('The %s of parameter group '
69
69
                                  'should be a list.') % PARAMETERS)
70
70
 
73
73
                    if param in grouped_parameters:
74
74
                        raise exception.StackValidationFailed(
75
75
                            error=_('Parameter Groups error'),
76
 
                            path=[PARAMETER_GROUPS, group.get('label')],
 
76
                            path=[PARAMETER_GROUPS, group.get('label', '')],
77
77
                            message=_(
78
78
                                'The %s parameter must be assigned to one '
79
79
                                'parameter group only.') % param)
84
84
                    if param not in self.parameter_names:
85
85
                        raise exception.StackValidationFailed(
86
86
                            error=_('Parameter Groups error'),
87
 
                            path=[PARAMETER_GROUPS, group.get('label')],
 
87
                            path=[PARAMETER_GROUPS, group.get('label', '')],
88
88
                            message=_(
89
89
                                'The grouped parameter %s does not reference '
90
90
                                'a valid parameter.') % param)