From 34018bb4d134101234a9bbf558189f65453e88af Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Sat, 1 Oct 2016 09:22:58 +0200 Subject: [PATCH] TT#4250 use some settings on prod from server.ini In order to be able to deploy that file with different values depending on the server so we can use -dev.mgm services on repoapi-dev.mgm Change-Id: I2f5546c4f664707250ab89f29e71d4092c848890 --- debian/rules | 4 ++++ repoapi/settings/prod.py | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 7175d65..756c6cf 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,10 @@ override_dh_auto_install: echo "[gerrit]" > gerrit.ini echo "HTTP_USER=fake" >> gerrit.ini echo "HTTP_PASSWD=fakeHTTPpass" >> gerrit.ini + echo "[server]" > server.ini + echo "JENKINS_URL=fake" >> server.ini + echo "GERRIT_URL=fake" >> server.ini + echo "BROKER_URL=fake" >> server.ini VAR_DIR=$(shell pwd) make deploy make clean diff --git a/repoapi/settings/prod.py b/repoapi/settings/prod.py index 41fccd4..72beaf5 100644 --- a/repoapi/settings/prod.py +++ b/repoapi/settings/prod.py @@ -52,8 +52,10 @@ DATABASES = { LOGGING['loggers']['repoapi']['level'] = os.getenv('DJANGO_LOG_LEVEL', 'INFO') -JENKINS_URL = "https://jenkins.mgm.sipwise.com" -GERRIT_URL = "https://gerrit.mgm.sipwise.com/{}" +server_config = RawConfigParser() +server_config.read(os.path.join(VAR_DIR, 'server.ini')) +JENKINS_URL = server_config.get('server', 'JENKINS_URL') +GERRIT_URL = server_config.get('server', 'GERRIT_URL') gerrit_config = RawConfigParser() gerrit_config.read(os.path.join(VAR_DIR, 'gerrit.ini')) @@ -64,7 +66,7 @@ GITWEB_URL = "https://git.mgm.sipwise.com/gitweb/?p={}.git;a=commit;h={}" WORKFRONT_CREDENTIALS = os.path.join(BASE_DIR, '/etc/jenkins_jobs/workfront.ini') # celery -BROKER_URL = 'amqp://guest:guest@localhost' +BROKER_URL = server_config.get('server', 'BROKER_URL') JBI_BASEDIR = os.path.join(VAR_DIR, 'jbi_files') JBI_ARTIFACT_JOBS = [ 'release-tools-runner',