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

Try to solve the conflict between role vars and global vars

Browse source
This commit is contained in:
Aurélien Bompard 2014-09-18 08:46:01 +00:00
parent 292a98d737
commit 444c0c8f62
8 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/mailman
View file

@ -23,4 +23,4 @@ fedmsg_certs:
postfix_group: mailman postfix_group: mailman
# Used by the mailman role # Used by the mailman role
mailman_dbserver: db01.phx2.fedoraproject.org mailman_db_server: db01.phx2.fedoraproject.org

2
inventory/group_vars/mailman-stg
View file

@ -32,4 +32,4 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m
postfix_group: mailman-stg postfix_group: mailman-stg
# Used by the mailman role # Used by the mailman role
mailman_dbserver: db02.stg.phx2.fedoraproject.org mailman_db_server: db02.stg.phx2.fedoraproject.org

11
playbooks/groups/mailman.yml
View file

@ -116,11 +116,12 @@
roles: roles:
- role: mailman - role: mailman
mailman_mm_db_pass: "{{ mailman_mm_db_pass }}" mailman_mailman_db_pass: "{{ mailman_mm_db_pass }}"
mailman_hk_admin_db_pass: "{{ mailman_hk_admin_db_pass }}" mailman_hyperkitty_admin_db_pass: "{{ mailman_hk_admin_db_pass }}"
mailman_hk_db_pass: "{{ mailman_hk_db_pass }}" mailman_hyperkitty_db_pass: "{{ mailman_hk_db_pass }}"
mailman_ks_admin_db_pass: "{{ mailman_ks_admin_db_pass }}" mailman_kittystore_admin_db_pass: "{{ mailman_ks_admin_db_pass }}"
mailman_ks_db_pass: "{{ mailman_ks_db_pass }}" mailman_kittystore_db_pass: "{{ mailman_ks_db_pass }}"
mailman_hyperkitty_cookie_key: "{{ mailman_hk_cookie_key }}"
- fedmsg/base - fedmsg/base
tasks: tasks:

13
playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
View file

@ -120,12 +120,13 @@
roles: roles:
- role: mailman - role: mailman
mailman_dbserver: localhost mailman_db_server: localhost
mailman_mm_db_pass: "thisisatest" mailman_mailman_db_pass: "thisisatest"
mailman_hk_admin_db_pass: "thisisatest" mailman_hyperkitty_admin_db_pass: "thisisatest"
mailman_hk_db_pass: "thisisatest" mailman_hyperkitty_db_pass: "thisisatest"
mailman_ks_admin_db_pass: "thisisatest" mailman_kittystore_admin_db_pass: "thisisatest"
mailman_ks_db_pass: "thisisatest" mailman_kittystore_db_pass: "thisisatest"
mailman_hyperkitty_cookie_key: "thisisatest"
- collectd/base - collectd/base
tasks: tasks:

13
roles/mailman/defaults/main.yml
View file

@ -1,9 +1,10 @@
--- ---
mailman_webui_basedir: /srv/webui mailman_webui_basedir: /srv/webui
mailman_webui_confdir: "{{ mailman_webui_basedir }}/config" mailman_webui_confdir: "{{ mailman_webui_basedir }}/config"
mailman_dbserver: localhost mailman_db_server: localhost
mailman_mm_db_pass: changeme mailman_mailman_db_pass: changeme
mailman_hk_admin_db_pass: changeme mailman_hyperkitty_admin_db_pass: changeme
mailman_hk_db_pass: changeme mailman_hyperkitty_db_pass: changeme
mailman_ks_admin_db_pass: changeme mailman_kittystore_admin_db_pass: changeme
mailman_ks_db_pass: changeme mailman_kittystore_db_pass: changeme
mailman_hyperkitty_cookie_key: changeme

2
roles/mailman/templates/mailman.cfg.j2
View file

@ -21,7 +21,7 @@ pid_file: /run/mailman3/master.pid
[database] [database]
class: mailman.database.postgresql.PostgreSQLDatabase class: mailman.database.postgresql.PostgreSQLDatabase
url: postgres://mailmanadmin:{{ mailman_mm_db_pass }}@{{ mailman_dbserver }}/mailman url: postgres://mailmanadmin:{{ mailman_mailman_db_pass }}@{{ mailman_db_server }}/mailman
[archiver.hyperkitty] [archiver.hyperkitty]
class: hyperkitty.archiver.Archiver class: hyperkitty.archiver.Archiver

8
roles/mailman/templates/settings.py.j2
View file

@ -29,8 +29,8 @@ DATABASES = {
'ENGINE': 'django.db.backends.postgresql_psycopg2', 'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'hyperkitty', 'NAME': 'hyperkitty',
'USER': 'hyperkittyapp', 'USER': 'hyperkittyapp',
'PASSWORD': '{{ mailman_hk_db_pass }}', 'PASSWORD': '{{ mailman_hyperkitty_db_pass }}',
'HOST': '{{ mailman_dbserver }}', 'HOST': '{{ mailman_db_server }}',
'PORT': '', # Set to empty string for default. 'PORT': '', # Set to empty string for default.
} }
} }
@ -115,7 +115,7 @@ STATICFILES_FINDERS = (
) )
# Make this unique, and don't share it with anybody. # Make this unique, and don't share it with anybody.
SECRET_KEY = '{{ mailman_hk_cookie_key }}' SECRET_KEY = '{{ mailman_hyperkitty_cookie_key }}'
# List of callables that know how to import templates from various sources. # List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = ( TEMPLATE_LOADERS = (
@ -354,7 +354,7 @@ APP_NAME = 'Fedora list archives'
USE_INTERNAL_AUTH = False USE_INTERNAL_AUTH = False
# URL to the KittyStore database # URL to the KittyStore database
KITTYSTORE_URL = 'postgres://kittystoreapp:{{ mailman_ks_db_pass }}@{{ mailman_dbserver }}/kittystore' KITTYSTORE_URL = 'postgres://kittystoreapp:{{ mailman_kittystore_db_pass }}@{{ mailman_db_server }}/kittystore'
# Path to the KittyStore search index (writable directory) # Path to the KittyStore search index (writable directory)
KITTYSTORE_SEARCH_INDEX = '{{ mailman_webui_basedir }}/kittystore_search_index' KITTYSTORE_SEARCH_INDEX = '{{ mailman_webui_basedir }}/kittystore_search_index'

6
roles/mailman/templates/settings_admin.py.j2
View file

@ -16,9 +16,9 @@ DATABASES = {
'ENGINE': 'django.db.backends.postgresql_psycopg2', 'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'hyperkitty', 'NAME': 'hyperkitty',
'USER': 'hyperkittyadmin', 'USER': 'hyperkittyadmin',
'PASSWORD': '{{ mailman_hk_admin_db_pass }}', 'PASSWORD': '{{ mailman_hyperkitty_admin_db_pass }}',
'HOST': '{{ mailman_dbserver }}', 'HOST': '{{ mailman_db_server }}',
'PORT': '', 'PORT': '',
} }
} }
KITTYSTORE_URL = 'postgres://kittystoreadmin:{{ mailman_ks_admin_db_pass }}@{{ mailman_dbserver }}/kittystore' KITTYSTORE_URL = 'postgres://kittystoreadmin:{{ mailman_kittystore_admin_db_pass }}@{{ mailman_db_server }}/kittystore'