Adding publish to the oo_azure module.

playbooks/azure/openshift-cluster/create_and_publish_offer.md

@@ -0,0 +1,46 @@
+# Create and publish offer
+
+Note:  This document is not intended for general consumption.
+
+
+This document outlines the process in which to publish an image to the cloudpartner.azure.com portal.
+
+# Publish image
+
+The steps to build the image are as follows:
+
+## Step 1:
+
+Build the Openshift image using the build_node_image.yml playbook.  Once this playbook completes it should
+produce a storage blob that points to the image.  This blob exists inside of the resourcegroup named images,
+storage accounts named openshiftimages, and the container named, images.
+
+```
+$ ansible-playbook build_node_image.yml
+```
+
+## Step 2:
+
+This step performs the following work:
+- generates a storage blob url
+- generates a sas url for the storage container
+- a cancel of any current operations on the offer will be called (in case of any updates)
+- if an offer exists, the current offer will be fetched and updated
+- if an offer ! exist, the offer will be created
+- a publish is called on the offer
+
+```
+$ ansible-playbook  create_and_publish_offer.yml -e @publishingvars.yml
+```
+
+Example publishingvars.yml
+```
+openshift_azure_container: images
+openshift_azure_storage_account: openshiftimages
+image_name: rhel7-3.9-201805211419
+openshift_azure_image_publish_emails:
+- support@redhat.com
+openshift_azure_templ_allowed_subscriptions:
+- <subcription id1>
+- <subcription id2>
+```

playbooks/azure/openshift-cluster/create_offer.yml

@@ -76,8 +76,20 @@
         msg: "{{ yeditout }}"
         verbosity: 1
 
-  - name: create an offer in cloudpartner portal
+    # this cancel operation returns a 202 whether it cancelled or not.
+    - name: cancel publish operation
+      oo_azure_rm_publish_image:
+        offer: "{{ azure_image_publish[image_type].offer }}"
+        state: cancel_op
+
+  - name: create|update an offer in cloudpartner portal
     oo_azure_rm_publish_image:
       offer: "{{ azure_image_publish[image_type].offer }}"
       offer_data: "{{ (lookup('template', 'offer.yml.j2') | from_yaml) if 'skipped' in yeditout and yeditout.skipped or not yeditout.changed else yeditout.results[0].result[0].edit }}"
-      force: "{{ openshift_azure_offer_force |default(False)}}"
+      force: True
+
+  - name: publish this offer
+    oo_azure_rm_publish_image:
+      state: publish
+      offer: "{{ azure_image_publish[image_type].offer }}"
+      emails: "{{ openshift_azure_image_publish_emails }}"

playbooks/azure/openshift-cluster/templates/offer.yml.j2

@@ -21,7 +21,8 @@ definition:
     microsoft-azure-marketplace.publicAzureSupportUrl: ''
     microsoft-azure-marketplace.salesForceLeadConfiguration: {}
     microsoft-azure-marketplace.screenshots: []
-    microsoft-azure-marketplace.summary: {{ azure_image_publish[image_type].templ_summary}}
+    microsoft-azure-marketplace.summary: {{ azure_image_publish[image_type].templ_summary }}
+    microsoft-azure-marketplace.title: {{ azure_image_publish[image_type].templ_title }}
     microsoft-azure-marketplace.supportContactEmail: support@redhat.com
     microsoft-azure-marketplace.supportContactName: Red Hat
     microsoft-azure-marketplace.supportContactPhone: 888-733-4281

roles/lib_utils/library/oo_azure_rm_publish_image.py

@@ -20,6 +20,7 @@ from __future__ import print_function  # noqa: F401
 # import httplib
 import json
 import os
+import time
 import requests
 
 from ansible.module_utils.basic import AnsibleModule
@@ -50,6 +51,7 @@ class AzurePublisher(object):
         self.api_version = 'api-version={}'.format(api_version)
         self.debug = debug
         # if self.debug:
+        # import httplib
         # httplib.HTTPSConnection.debuglevel = 1
         # httplib.HTTPConnection.debuglevel = 1
 
@@ -120,6 +122,18 @@ class AzurePublisher(object):
 
         return self.prepare_action(url, 'POST')
 
+    def publish(self, offer, emails):
+        ''' publish an offer '''
+        url = '/offers/{0}/publish?{1}'.format(offer, self.api_version)
+
+        data = {
+            'metadata': {
+                'notification-emails': ','.join(emails),
+            }
+        }
+
+        return self.prepare_action(url, 'POST', data=data)
+
     def go_live(self, offer):
         ''' create or modify an offer '''
         url = '/offers/{0}/golive?{1}'.format(offer, self.api_version)
@@ -160,12 +174,31 @@ class AzurePublisher(object):
 
         return AzurePublisher.request(action.upper(), self.server + url, data, headers)
 
+    def cancel_and_wait_for_operation(self, params):
+        '''cancel the current publish operation and wait for operation to complete'''
+
+        # cancel the publish operation
+        self.cancel_operation(offer=params['offer'])
+
+        # we need to wait here for 'submissionState' to move to 'canceled'
+        while True:
+            # fetch operations
+            ops = self.get_operations(params['offer'])
+            if self.debug:
+                print(ops.json())
+            if ops.json()[0]['submissionState'] == 'canceled':
+                break
+
+            time.sleep(5)
+
+        return ops
+
     def manage_offer(self, params):
         ''' handle creating or modifying offers'''
         # fetch the offer to verify it exists:
         results = self.get_offers(offer=params['offer'])
 
-        if (results.status_code == 200 or results.status_code == 404) and params['force']:
+        if results.status_code == 200 and params['force']:
             return self.create_or_modify_offer(offer=params['offer'], data=params['offer_data'], modify=True)
 
         return self.create_or_modify_offer(offer=params['offer'], data=params['offer_data'])
@@ -194,16 +227,19 @@ class AzurePublisher(object):
 
         if params['state'] == 'offer':
             results = apc.manage_offer(params)
+        elif params['state'] == 'publish':
+            results = apc.publish(offer=params['offer'], emails=params['emails'])
+            results.json = lambda: ''
         elif params['state'] == 'cancel_op':
-            results = apc.cancel_operation(offer=params['offer'])
+            results = apc.cancel_and_wait_for_operation(params)
         elif params['state'] == 'go_live':
             results = apc.go_live(offer=params['offer'])
         else:
-            raise AzurePublisherException('Unsupported query type: {}'.format(params['query']))
+            raise AzurePublisherException('Unsupported query type: {}'.format(params['state']))
 
         changed = False
 
-        if results.status_code in [200, 201]:
+        if results.status_code in [200, 201, 202]:
             changed = True
 
         return {'data': results.json(), 'changed': changed, 'status_code': results.status_code}
@@ -215,7 +251,7 @@ def main():
 
     module = AnsibleModule(
         argument_spec=dict(
-            state=dict(default='offer', choices=['offer', 'cancel_op', 'go_live']),
+            state=dict(default='offer', choices=['offer', 'cancel_op', 'go_live', 'publish']),
             force=dict(default=False, type='bool'),
             publisher=dict(default='redhat', type='str'),
             debug=dict(default=False, type='bool'),
@@ -223,8 +259,13 @@ def main():
             client_id=dict(default=os.environ.get('AZURE_CLIENT_ID'), type='str'),
             client_secret=dict(default=os.environ.get('AZURE_CLIENT_SECRET'), type='str'),
             offer=dict(default=None, type='str'),
-            offer_data=dict(required=True, type='dict'),
+            offer_data=dict(default=None, type='dict'),
+            emails=dict(default=None, type='list'),
         ),
+
+        required_if=[
+            ["state", "offer", ["offer_data"]],
+        ],
     )
 
     # Verify we recieved either a valid key or edits with valid keys when receiving a src file.