Merge pull request #92 from sayanchowdhury/hotfix/include-image-url-i…

…n-fedmsg fedimg: Include the image_url in fedmsg messages
fedora-infra · Apr 13, 2018 · 8c2f793 · 8c2f793
2 parents 74c4ffd + e21f70d
commit 8c2f793
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/fedimg/services/ec2/ec2imgpublisher.py b/fedimg/services/ec2/ec2imgpublisher.py
@@ -42,6 +42,7 @@ def __init__(self, **kwargs):
             'compose_id': None,
             'image_id': None,
             'image_name': 'Fedora-AMI',
+            'image_url': None,
             'image_description': 'Fedora AMI Description',
             'service': 'EC2',
             'region': None,
@@ -181,6 +182,7 @@ def publish_images(self, region_image_mapping=None):
                     topic='image.publish',
                     msg=dict(
                         image_name=image.name,
+                        image_url=self.image_url,
                         destination=self.region,
                         service=self.service,
                         compose=self.compose_id,
@@ -196,6 +198,7 @@ def publish_images(self, region_image_mapping=None):
                     topic='image.upload',
                     msg=dict(
                         image_name=image.name,
+                        image_url=self.image_url,
                         destination=self.region,
                         service=self.service,
                         status='completed',

diff --git a/fedimg/services/ec2/ec2initiate.py b/fedimg/services/ec2/ec2initiate.py
@@ -110,6 +110,7 @@ def main(image_urls, access_id, secret_key, regions, volume_types=None,
                 access_key=access_id,
                 secret_key=secret_key,
                 push_notifications=push_notifications,
+                image_url=image_url
             )
 
             combinations = itertools_product(