Move api-paste file to common code location

Change-Id: I33c8055245de5821fd8a605d4ea6bf388a01637e
This commit is contained in:
Julien Danjou 2017-01-17 20:01:31 +01:00
parent 30f4bfa11b
commit 7b0435a706
5 changed files with 4 additions and 10 deletions

View File

@ -12,13 +12,16 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import os
from oslo_config import cfg
# Register options for the service
OPTS = [
cfg.StrOpt('paste_config',
default="api_paste.ini",
default=os.path.abspath(
os.path.join(
os.path.dirname(__file__), "api-paste.ini")),
help="Configuration file for WSGI definition of API."),
cfg.StrOpt(
'auth_mode',

View File

@ -44,9 +44,6 @@ class FunctionalTest(db_test_base.TestBase):
self.CONF.set_override('policy_file',
os.path.abspath('etc/aodh/policy.json'),
group='oslo_policy', enforce_type=True)
self.CONF.set_override('paste_config',
os.path.abspath('etc/aodh/api_paste.ini'),
group='api', enforce_type=True)
self.CONF.set_override('auth_mode', None, group='api')
self.app = webtest.TestApp(app.load_app(self.CONF))

View File

@ -81,11 +81,6 @@ class ConfigFixture(fixture.GabbiFixture):
'aodh/tests/open-policy.json'),
group='oslo_policy',
enforce_type=True)
conf.set_override(
'paste_config',
os.path.abspath('etc/aodh/api_paste.ini'),
group='api',
)
conf.set_override('auth_mode', None, group='api')
parsed_url = urlparse.urlparse(db_url)

View File

@ -173,7 +173,6 @@ function configure_aodh {
cp $AODH_DIR/etc/aodh/policy.json $AODH_CONF_DIR
iniset $AODH_CONF oslo_policy policy_file $AODH_CONF_DIR/policy.json
cp $AODH_DIR/etc/aodh/api_paste.ini $AODH_CONF_DIR
cp $AODH_DIR/etc/aodh/aodh-config-generator.conf $AODH_CONF_DIR
# The alarm evaluator needs these options to call gnocchi/ceilometer APIs