fedimg: Update the fedimg tasks a/c to the 1.0.1 release

Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
This commit is contained in:
Sayan Chowdhury 2018-02-19 19:44:37 +05:30 committed by Sayan Chowdhury
parent 87a209c8d3
commit 0373ea8867
4 changed files with 48 additions and 73 deletions

View file

@ -23,7 +23,7 @@
- name: copy base configuration
template: >
src=fedimg.cfg dest=/etc/fedimg.cfg
src=fedimg-conf.toml dest=/etc/fedimg/fedimg-conf.toml
owner=fedmsg group=fedmsg mode=0700
notify:
- restart fedmsg-hub

View file

@ -0,0 +1,33 @@
[general]
clean_up_on_failure = {{clean_up_on_failure}}
delete_images_on_failure = {{delete_images_on_failure}}
process_count = {{process_count}}
active_services = ['aws']
[aws]
volume_size = {{aws_volume_size}}
{% if env == 'staging' %}
access_id = {{fedimg_aws_stg_access_id}}
secret_key = {{fedimg_aws_stg_secret_key}}
{% else %}
access_id = {{fedimg_aws_prod_access_id}}
secret_key = {{fedimg_aws_prod_secret_key}}
{% endif %}
base_region = 'us-east-1'
regions = ['ap-northeast-2', 'us-east-2', 'ap-southeast-1', 'ap-southeast-2',
'ap-south-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-2',
'us-west-1', 'eu-central-1', 'ap-northeast-1']
[rackspace]
username = someuser
api_key = secretk3y
[gce]
email = someacct@provider.com
keypath = /path/to/pem/file
project_id = someprojectid
[hp]
username = aperson
password = somecoolpassword
tenant = theprojectname

View file

@ -1,69 +0,0 @@
[general]
clean_up_on_failure = {{clean_up_on_failure}}
delete_images_on_failure = {{delete_images_on_failure}}
[koji]
{% if env == 'staging' %}
server = https://koji.stg.fedoraproject.org/kojihub
# The two adjacent slashes in the below URL are _not_ a typo.
base_task_url = https://kojipkgs.stg.fedoraproject.org//work/tasks
{% else %}
server = https://koji.fedoraproject.org/kojihub
# The two adjacent slashes in the below URL are _not_ a typo.
base_task_url = https://kojipkgs.fedoraproject.org//work/tasks
{% endif %}
[aws]
util_username = {{aws_util_username}}
test_username = {{aws_test_username}}
util_volume_size = {{aws_util_volume_size}}
test_volume_size = {{aws_test_volume_size}}
{% if env == 'staging' %}
access_id = {{fedimg_aws_stg_access_id}}
secret_key = {{fedimg_aws_stg_secret_key}}
{% else %}
access_id = {{fedimg_aws_prod_access_id}}
secret_key = {{fedimg_aws_prod_secret_key}}
{% endif %}
iam_profile = {{aws_iam_profile}}
keyname = {{aws_keyname}}
keypath = {{aws_keypath}}
pubkeypath = {{aws_pubkeypath}}
test = {{aws_test}}
amis = us-east-1|RHEL|6.5|x86_64|ami-be6a98d6|aki-919dcaf8
ap-northeast-1|RHEL|6.5|x86_64|ami-e7aee0e6|aki-176bf516
ap-southeast-1|RHEL|6.5|x86_64|ami-c683df94|aki-503e7402
ap-southeast-2|RHEL|6.5|x86_64|ami-41ra8f7b|aki-c362fff9
eu-central-1|RHEL|6.5|x86_64|ami-76eddb6b|aki-184c7a05
eu-west-1|RHEL|6.5|x86_64|ami-81f23cf6|aki-52a34525
sa-east-1|RHEL|6.5|x86_64|ami-b7ec43aa|aki-5553f448
us-west-1|RHEL|6.5|x86_64|ami-fc393eb9|aki-880531cd
us-west-2|RHEL|6.5|x86_64|ami-79daa849|aki-fc8f11cc
us-east-1|RHEL|6.5|i386|ami-acac51c4|aki-8f9dcae6
ap-northeast-1|RHEL|6.5|i386|ami-c7bff1c6|aki-136bf512
ap-southeast-1|RHEL|6.5|i386|ami-9eb8e4cc|aki-ae3973fc
ap-southeast-2|RHEL|6.5|i386|ami-87f194bd|aki-cd62fff7
eu-central-1|RHEL|6.5|i386|ami-76eddb6b|aki-184c7a05
eu-west-1|RHEL|6.5|i386|ami-7101cf06|aki-68a3451f
sa-east-1|RHEL|6.5|i386|ami-e9e847f4|aki-5b53f446
us-west-1|RHEL|6.5|i386|ami-eacfc8af|aki-8e0531cb
us-west-2|RHEL|6.5|i386|ami-25cab815|aki-f08f11c0
# none of the stuff below this line is used right now,
# so these placeholders can stay
[rackspace]
username = someuser
api_key = secretk3y
[gce]
email = someacct@provider.com
keypath = /path/to/pem/file
project_id = someprojectid
[hp]
username = aperson
password = somecoolpassword
tenant = theprojectname

View file

@ -18,8 +18,19 @@
#
# Authors: David Gay <dgay@redhat.com>
# Ralph Bean <rbean@redhat.com>
# Sayan Chowdhury <sayan@redhat.com>
#
config = dict(
fedimgconsumer=True,
)
{% if env == 'staging' %}
config = {
'fedimgconsumer.dev.enabled': False,
'fedimgconsumer.prod.enabled': False,
'fedimgconsumer.stg.enabled': True,
}
{% else %}
config = {
'fedimgconsumer.dev.enabled': False,
'fedimgconsumer.prod.enabled': True,
'fedimgconsumer.stg.enabled': False,
}
{% endif %}