Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

making stg/prod differences in blockerbugs more sane

Browse source
This commit is contained in:
Tim Flink 2017-08-15 18:06:46 +00:00
parent 95e1adcc6d
commit 70866fd532
3 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
inventory/group_vars/blockerbugs
View file

@ -20,6 +20,9 @@ master_blockerbugs_node: False
host_group: blockerbugs host_group: blockerbugs
blockerbugs_secret_key: "{{ stg_blockerbugs_secret_key }}" blockerbugs_secret_key: "{{ stg_blockerbugs_secret_key }}"
blockerbugs_bugzilla_url: 'https://bugzilla.redhat.com/'
blockerbugs_bodhi_url: 'https://bodhi.fedoraproject.org/'
blockerbugs_koji_url: "http://koji.fedoraproject.org/"
############################################################ ############################################################
# blockerbugs db details # blockerbugs db details
@ -30,6 +33,6 @@ blockerbugs_db_host: "{{ blockerbugs_db_host_machine }}"
blockerbugs_db_port: 5432 blockerbugs_db_port: 5432
blockerbugs_db_name: blockerbugs blockerbugs_db_name: blockerbugs
# these aren't right but they're just placeholders for now # these aren't right but they're just placeholders for now
blockerbugs_db_user: "{{ stg_blockerbugs_db_user }}" blockerbugs_db_user: "{{ prod_blockerbugs_db_user }}"
blockerbugs_db_password: "{{ stg_blockerbugs_db_password }}" blockerbugs_db_password: "{{ prod_blockerbugs_db_password }}"

7
inventory/group_vars/blockerbugs-stg
View file

@ -19,6 +19,13 @@ master_blockerbugs_node: False
blockerbugs_secret_key: "{{ stg_blockerbugs_secret_key }}" blockerbugs_secret_key: "{{ stg_blockerbugs_secret_key }}"
blockerbugs_bugzilla_url: 'https://bugzilla.redhat.com/'
blockerbugs_bodhi_url: 'https://bodhi.fedoraproject.org/'
blockerbugs_koji_url: "http://koji.fedoraproject.org/"
# these are to use stg stuff but that often doesn't work well
#blockerbugs_bugzilla_url: 'https://partner-bugzilla.redhat.com/'
#blockerbugs_bodhi_url: 'https://bodhi.stg.fedoraproject.org/'
############################################################ ############################################################
# blockerbugs db details # blockerbugs db details
############################################################ ############################################################

17
roles/blockerbugs/templates/blockerbugs-settings.py.j2
View file

@ -1,9 +1,5 @@
SECRET_KEY = '{{ blockerbugs_secret_key }}' SECRET_KEY = '{{ blockerbugs_secret_key }}'
{% if env == "staging" %}
SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ blockerbugs_db_user }}:{{ blockerbugs_db_password }}@{{ blockerbugs_db_host }}:{{ blockerbugs_db_port }}/{{ blockerbugs_db_name }}' SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ blockerbugs_db_user }}:{{ blockerbugs_db_password }}@{{ blockerbugs_db_host }}:{{ blockerbugs_db_port }}/{{ blockerbugs_db_name }}'
{% else %}
SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ blockerbugs_app }}:{{ blockerbugs_appPassword }}@db-blockerbugs/blockerbugs'
{% endif %}
FAS_ADMIN_GROUP = "qa-admin" FAS_ADMIN_GROUP = "qa-admin"
FAS_USER = "{{ blockerbugs_fas_user }}@fedoraproject.org" FAS_USER = "{{ blockerbugs_fas_user }}@fedoraproject.org"
FAS_PASSWORD = "{{ blockerbugs_fas_password }}" FAS_PASSWORD = "{{ blockerbugs_fas_password }}"
@ -11,18 +7,11 @@ FAS_PASSWORD = "{{ blockerbugs_fas_password }}"
FAS_FLASK_COOKIE_REQUIRES_HTTPS = False FAS_FLASK_COOKIE_REQUIRES_HTTPS = False
FAS_CHECK_CERT = False FAS_CHECK_CERT = False
PRODUCTION = False PRODUCTION = False
# maybe this should be pointing at staging but that makes
# the app really difficult to test because the data is so old
#BUGZILLA_URL = 'https://partner-bugzilla.redhat.com/'
#BODHI_URL = 'https://bodhi.stg.fedoraproject.org/'
BUGZILLA_URL = 'https://bugzilla.redhat.com/'
BODHI_URL = 'https://bodhi.fedoraproject.org/'
{% else %}
BUGZILLA_URL = 'https://bugzilla.redhat.com/'
BODHI_URL = 'https://bodhi.fedoraproject.org/'
{% endif %} {% endif %}
BUGZILLA_URL = '{{ blockerbugs_bugzilla_url }}'
BODHI_URL = '{{ blockerbugs_bodhi_url }}'
BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi' BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi'
KOJI_URL = "http://koji.fedoraproject.org/" KOJI_URL = "{{ blockerbugs_bugzilla_url }}"
FILE_LOGGING = False FILE_LOGGING = False
SYSLOG_LOGGING = True SYSLOG_LOGGING = True
STREAM_LOGGING = True STREAM_LOGGING = True