PR#524: Fix installing subject types - greenwave

Lukas Holecek • 4 years ago

2545248

greenwave/config.py

file modified

+1 -3

		`@@ -31,7 +31,7 @@`
		`REQUESTS_VERIFY = True`

		`POLICIES_DIR = '/etc/greenwave/policies'`
		`- SUBJECT_TYPES_DIR = '/etc/greenwave/subject_types'`
		`+ SUBJECT_TYPES_DIR = _local_conf_dir('subject_types')`

		`MESSAGING = 'fedmsg'`

		`@@ -53,7 +53,6 @@`
		`WAIVERDB_API_URL = 'http://localhost:5004/api/v1.0'`
		`GREENWAVE_API_URL = 'http://localhost:5005/api/v1.0'`
		`POLICIES_DIR = _local_conf_dir('policies')`
		`- SUBJECT_TYPES_DIR = _local_conf_dir('subject_types')`


		`class TestingConfig(Config):`
		`@@ -62,4 +61,3 @@`
		`GREENWAVE_API_URL = 'http://localhost:5005/api/v1.0'`
		`KOJI_BASE_URL = 'http://localhost:5006/kojihub'`
		`POLICIES_DIR = _local_conf_dir('policies')`
		`- SUBJECT_TYPES_DIR = _local_conf_dir('subject_types')`

setup.py

file modified

+1 -1

		`@@ -101,6 +101,6 @@`
		`""",`
		`data_files=[`
		`('/etc/fedmsg.d/', ['fedmsg.d/resultsdb.py', 'fedmsg.d/waiverdb.py']),`
		`- ('/etc/greenwave/subject_types/', glob.glob('conf/subject_types/*')),`
		`+ ('conf/subject_types/', glob.glob('conf/subject_types/*')),`
		`]`
		`)`

Installing subject types to "/etc/greenwave" breaks existing OpenShift
templates which remount the configuration directory with custom files.

This instead installs the files in Python module under
"conf/subject_types" directory.

The path to this directory can still be overridden with
SUBJECT_TYPES_DIR option.

JIRA: FACTORY-5574
Signed-off-by: Lukas Holecek hluk@email.cz

Assignee

None

Tags

No Tags