diff --git a/roles/fedimg/tasks/main.yml b/roles/fedimg/tasks/main.yml index ec11c4e41f..60749039d6 100644 --- a/roles/fedimg/tasks/main.yml +++ b/roles/fedimg/tasks/main.yml @@ -13,6 +13,14 @@ tags: - fedimg +- name: install extra packages in staging + package: name={{ item }} state=present + with_items: + - euca2ools + when: env == "staging" + tags: + - fedimg + - name: copy manual trigger script copy: > src=trigger_upload.py @@ -30,6 +38,16 @@ tags: - fedimg +- name: copy the euca2ools configuration file + template: > + src=fedimg-euca-conf.ini dest=/etc/euca2ools/conf.d/fedimg-euca-conf.ini + owner=fedmsg group=fedmsg mode=0700 + notify: + - restart fedmsg-hub + when: env == "staging" + tags: + - fedimg + - name: copy koji fedmsg consumer template: > src=fedmsg.d/fedimg.py dest=/etc/fedmsg.d/fedimg.py diff --git a/roles/fedimg/templates/fedimg-euca-conf.ini b/roles/fedimg/templates/fedimg-euca-conf.ini new file mode 100644 index 0000000000..e14f0cda78 --- /dev/null +++ b/roles/fedimg/templates/fedimg-euca-conf.ini @@ -0,0 +1,11 @@ +[user fedimg] +{% if env == 'staging' %} +key-id = {{fedimg_aws_stg_access_id}} +secret-key = {{fedimg_aws_stg_secret_key}} +{% else %} +key-id = {{fedimg_aws_prod_access_id}} +secret-key = {{fedimg_aws_prod_secret_key}} +{% endif %} + +[region aws:*] +user = fedimg