Merge branch 'master' of /git/ansible

2026-04-29 13:01:36 +08:00 · 2018-04-05 22:12:05 +00:00
parent 1eddae4170 e70ba90841
commit aa927689ea
2 changed files with 3 additions and 3 deletions
--- a/roles/fedimg/tasks/main.yml
+++ b/roles/fedimg/tasks/main.yml
@@ -17,7 +17,6 @@
  package: name={{ item }} state=present
  with_items:
  - euca2ools
-  when: env == "staging"
  tags:
  - fedimg

@@ -44,7 +43,6 @@
      owner=fedmsg group=fedmsg mode=0700
  notify:
  - restart fedmsg-hub
-  when: env == "staging"
  tags:
  - fedimg

--- a/roles/fedimg/templates/fedmsg.d/fedimg.py
+++ b/roles/fedimg/templates/fedmsg.d/fedimg.py
@@ -29,6 +29,8 @@ config = {
 }
 {% else %}
 config = {
-    'fedimgconsumer': True,
+    'fedimgconsumer.dev.enabled': False,
+    'fedimgconsumer.prod.enabled': True,
+    'fedimgconsumer.stg.enabled': False,
 }
 {% endif %}