From 07cd4b2c3c57c61c73e253e77223d67401db9803 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mon, 4 May 2015 22:32:58 +0200 Subject: [PATCH] Add and install the alembic.ini for MM2 --- roles/mirrormanager/backend/tasks/main.yml | 10 ++-- roles/mirrormanager/crawler/tasks/main.yml | 14 ++++-- roles/mirrormanager/frontend2/tasks/main.yml | 1 + .../frontend2/templates/alembic.ini | 49 +++++++++++++++++++ 4 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 roles/mirrormanager/frontend2/templates/alembic.ini diff --git a/roles/mirrormanager/backend/tasks/main.yml b/roles/mirrormanager/backend/tasks/main.yml index 5b0b73c0ac..dd4751471e 100644 --- a/roles/mirrormanager/backend/tasks/main.yml +++ b/roles/mirrormanager/backend/tasks/main.yml @@ -24,9 +24,13 @@ file: path=/var/log/mirrormanager state=directory owner=mirrormanager group=mirrormanager mode=0755 - name: install MM configuration file - template: src={{ roles }}/mirrormanager/frontend2/templates/mirrormanager2.cfg - dest=/etc/mirrormanager/mirrormanager2.cfg - mode=600 owner=mirrormanager group=mirrormanager + template: src={{ item.file }} dest={{ item.dest }} + owner=mirrormanager group=mirrormanager mode=0600 + with_items: + - { file: {{ roles }}/mirrormanager/frontend2/templates/mirrormanager2.cfg, + dest: /etc/mirrormanager/mirrormanager2.cfg } + - { file: {{ roles }}/mirrormanager/frontend2/templates/alembic.ini, + dest: /etc/mirrormanager/alembic.ini } tags: - config diff --git a/roles/mirrormanager/crawler/tasks/main.yml b/roles/mirrormanager/crawler/tasks/main.yml index 0f4d0f1811..b94adcc182 100644 --- a/roles/mirrormanager/crawler/tasks/main.yml +++ b/roles/mirrormanager/crawler/tasks/main.yml @@ -21,11 +21,15 @@ file: path=/etc/mirrormanager state=directory - name: install MM configuration file - template: src={{ roles }}/mirrormanager/frontend2/templates/mirrormanager2.cfg - dest=/etc/mirrormanager/mirrormanager2.cfg - mode=600 owner=mirrormanager group=mirrormanager - tags: - - config + template: src={{ item.file }} dest={{ item.dest }} + owner=mirrormanager group=mirrormanager mode=0600 + with_items: + - { file: {{ roles }}/mirrormanager/frontend2/templates/mirrormanager2.cfg, + dest: /etc/mirrormanager/mirrormanager2.cfg } + - { file: {{ roles }}/mirrormanager/frontend2/templates/alembic.ini, + dest: /etc/mirrormanager/alembic.ini } + tags: + - config - name: install the cron job copy: src=crawler.cron dest=/etc/cron.d/mm2_crawler.cron diff --git a/roles/mirrormanager/frontend2/tasks/main.yml b/roles/mirrormanager/frontend2/tasks/main.yml index c9ca50b016..20f01b7dda 100644 --- a/roles/mirrormanager/frontend2/tasks/main.yml +++ b/roles/mirrormanager/frontend2/tasks/main.yml @@ -24,6 +24,7 @@ with_items: - { file: mirrormanager.conf, dest: /etc/httpd/conf.d/mirrormanager.conf } - { file: mirrormanager2.cfg, dest: /etc/mirrormanager/mirrormanager2.cfg } + - { file: alembic.ini, dest: /etc/mirrormanager/alembic.ini } - { file: mirrormanager2.wsgi, dest: /var/www/mirrormanager2.wsgi } notify: - restart httpd diff --git a/roles/mirrormanager/frontend2/templates/alembic.ini b/roles/mirrormanager/frontend2/templates/alembic.ini new file mode 100644 index 0000000000..06a04f720f --- /dev/null +++ b/roles/mirrormanager/frontend2/templates/alembic.ini @@ -0,0 +1,49 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts +script_location = /usr/share/mirrormanager2/alembic + +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +sqlalchemy.url = postgresql://{{ mirrormanager_db_user }}:{{ mirrormanager_db_pass }}@{{ mirrormanager_db_host }}/{{ mirrormanager_db_name }} + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S