x/packstack
Code Issues Proposed changes

Align the stars to fix CI

Browse Source 
This is a combination of two fixes:

1- Update version of hacking used in tests

We were using an old version of hacking that did not support
pbr==2.0.0, and this is creating issues running flake8.

Since we are now using a newer version, a couple updates are required
to get the tests to pass.

2- Remove the workaround for the Nova placement WSGI file

https://review.openstack.org/440638 added a workaround on the Puppet
side, so it was conflicting with ours.

Change-Id: I7384a7b5612866b2a70643ae4203a1848fdf8679
This commit is contained in:
Javier Pena 2017-03-02 11:48:41 +01:00
parent feeca376ad
commit 523d8dcd39
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/installer/setup_controller.py
View File

@ -44,7 +44,7 @@ class Controller(object):
instance from a class which inherit Controller. instance from a class which inherit Controller.
did not use isinstance because inheritence makes it behave erratically. did not use isinstance because inheritence makes it behave erratically.
""" """
if self != type(self.__single): if self != type(self.__single): # flake8: noqa
self.__single = object.__new__(self, *args, **kwargs) self.__single = object.__new__(self, *args, **kwargs)
return self.__single return self.__single

2
packstack/modules/documentation.py
View File

@ -2,8 +2,6 @@
# #
# Copyright (C) 2015 Red Hat, Inc. # Copyright (C) 2015 Red Hat, Inc.
# #
# Author: Martin Magr <mmagr@redhat.com>
#
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at

6
packstack/puppet/modules/packstack/manifests/nova/api.pp
View File

@ -47,12 +47,6 @@ class packstack::nova::api ()
api_port => '8778', api_port => '8778',
ssl => false, ssl => false,
workers => hiera('CONFIG_SERVICE_WORKERS'), workers => hiera('CONFIG_SERVICE_WORKERS'),
} ->
# TODO(jpena): remove the sample file from the package, then remove this workaround
# https://review.rdoproject.org/r/4721
file { '/etc/httpd/conf.d/00-nova-placement-api.conf':
ensure => absent,
before => Service['httpd'],
} }
class { '::nova::placement': class { '::nova::placement':

2
test-requirements.txt
View File

@ -3,4 +3,4 @@ oslosphinx>=2.5.0 # Apache-2.0
reno>=0.1.1 # Apache2 reno>=0.1.1 # Apache2
os-testr>=0.4.1 # Apache-2.0 os-testr>=0.4.1 # Apache-2.0
coverage coverage
hacking>=0.9.5,<0.10 hacking!=0.13.0,<0.14,>=0.12.0