ec8b2576da
The older hacking library has a cap on pbr <2.0, with the recent 2.0.0
release of PBR it's causing failures in the pep8 job.
hacking isn't kept in sync via the typical proposal-bot updates.
Do it manually to clear the gate issue.
pep8 runtests: commands[0] | flake8
./os_collect_config/merger.py:45:22: W292 no newline at end of file
return final_list
Change-Id: If863d2e190a4e1701ebf1fcb99a783075cda2556
Related-Bug: #1668848
46 lines
1.7 KiB
Python
46 lines
1.7 KiB
Python
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
|
|
from oslo_log import log
|
|
|
|
|
|
logger = log.getLogger(__name__)
|
|
|
|
|
|
def merged_list_from_content(final_content, deployment_keys, collector_name):
|
|
final_list = []
|
|
for depkey in deployment_keys:
|
|
if depkey in final_content:
|
|
deployments = final_content[depkey]
|
|
if not isinstance(deployments, list):
|
|
logger.warn(
|
|
'Deployment-key %s was found but does not contain a '
|
|
'list.' % (depkey,))
|
|
continue
|
|
logger.debug(
|
|
'Deployment found for %s' % (depkey,))
|
|
for deployment in deployments:
|
|
if 'name' not in deployment:
|
|
logger.warn(
|
|
'No name found for a deployment under %s.' %
|
|
(depkey,))
|
|
continue
|
|
if deployment.get('group', 'Heat::Ungrouped') in (
|
|
'os-apply-config', 'Heat::Ungrouped'):
|
|
final_list.append((deployment['name'],
|
|
deployment['config']))
|
|
final_list.insert(0, (collector_name, final_content))
|
|
return final_list
|