Merge pull request #9053 from jim-minter/publish

Azure: update create_and_publish_offer to match new offer/SKUs

playbooks/azure/openshift-cluster/create_and_publish_offer.md

@@ -39,8 +39,15 @@ openshift_azure_container: images
 openshift_azure_storage_account: openshiftimages
 image_name: rhel7-3.9-201805211419
 openshift_azure_image_publish_emails:
-- support@redhat.com
+- your.name@email.com
 openshift_azure_templ_allowed_subscriptions:
 - <subcription id1>
 - <subcription id2>
+openshift_azure_templ_restricted_audience_manual_entries:
+- type: subscriptionId
+  id: <subcription id1>
+  description: <description1>
+- type: subscriptionId
+  id: <subcription id2>
+  description: <description2>
 ```

playbooks/azure/openshift-cluster/create_and_publish_offer.yml

@@ -37,12 +37,15 @@
   - name: set the image_type
     set_fact:
       image_type: "{{ 'rhel' if 'rhel' in image_tags.base_image else 'centos' }}"
+      image_x: "{{ image_tags.openshift.split('.')[0] }}"
+      image_y: "{{ image_tags.openshift.split('.')[1] }}"
+      image_z: "{{ image_tags.openshift.split('.')[2] }}"
       image_vm_images: |-
-        { "{{ image_tags.openshift | regex_search('([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3})') }}": {"osVhdUrl": "{{ openshift_azure_sas_url }}" } }
+        { "{{ image_x }}{{ image_y }}.{{ image_z }}.{{ (image_name | regex_search('([0-9]{12})'))[:8] }}": {"osVhdUrl": "{{ openshift_azure_sas_url }}" } }
 
   - name: fetch the current offer and update the versions
     oo_azure_rm_publish_image_facts:
-      offer: "{{ azure_image_publish[image_type].offer }}"
+      offer: osa
     register: offerout
 
   - when:
@@ -79,17 +82,17 @@
     # 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 }}"
+        offer: osa
         state: cancel_op
 
   - name: create|update an offer in cloudpartner portal
     oo_azure_rm_publish_image:
-      offer: "{{ azure_image_publish[image_type].offer }}"
+      offer: osa
       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: True
 
   - name: publish this offer
     oo_azure_rm_publish_image:
       state: publish
-      offer: "{{ azure_image_publish[image_type].offer }}"
+      offer: osa
       emails: "{{ openshift_azure_image_publish_emails }}"

playbooks/azure/openshift-cluster/group_vars/all/image_publish.yml

@@ -1,29 +1,13 @@
 ---
 azure_image_publish:
   rhel:
-    offer: acsengine
-    offer_force: True
-    templ_display_text: Openshift for acsengine
-    templ_sku_summary: Openshift on Red Hat Enterprise Linux on Azure
-    templ_sku_description: Openshift on Red Hat Enterprise Linux
-    templ_offer_id: acsengine
-    templ_plan_id: rhel74
-    templ_title: Openshift on Red Hat Enterprise Linux
-    templ_os: rhel7
-    templ_description: Openshift image baked on Rhel
-    templ_summary: Openshift for Rhel
-    templ_marketing_url_id: openshift-acsengine
+    templ_plan_id: osa_{{ image_x }}{{ image_y }}
+    templ_sku_title: Openshift {{ image_x }}.{{ image_y }} on Azure
+    templ_os_type: Red Hat Enterprise Linux
+    templ_os: Red Hat Enterprise Linux 7
 
   centos:
-    offer: origin-acsengine
-    offer_force: True
-    templ_display_text: origin for acsengine
-    templ_sku_description: Openshift Origin on CentOS 7
-    templ_sku_summary: Openshift Origin on CentOS on Azure
-    templ_offer_id: origin-acsengine
-    templ_plan_id: centos7
-    templ_title: CentOS 7 for Origin
-    templ_os: CentOS
-    templ_description: Openshift Origin on CentOS
-    templ_summary: Openshift Origin on CentOS
-    templ_marketing_url_id: origin-acsengine
+    templ_plan_id: origin_{{ image_x }}{{ image_y }}
+    templ_sku_title: Openshift Origin {{ image_x }}.{{ image_y }} on Azure
+    templ_os_type: CentOS
+    templ_os: CentOS 7

roles/lib_utils/library/oo_azure_rm_publish_image.py

@@ -65,9 +65,11 @@ class AzurePublisher(object):
     @property
     def token(self):
         '''property for the access_token
-            curl -d \
-            'client_id=<id>&client_secret=<sec>&grant_type=client_credentials&resource=https://cloudpartner.azure.com' \
-            https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/token
+            curl --data-urlencode "client_id=$AZURE_CLIENT_ID" \
+                --data-urlencode "client_secret=$AZURE_CLIENT_SECRET" \
+                --data-urlencode "grant_type=client_credentials" \
+                --data-urlencode "resource=https://cloudpartner.azure.com" \
+                https://login.microsoftonline.com/$AZURE_TENANT_ID/oauth2/token
         '''
         if self._access_token is None:
             url = 'https://login.microsoftonline.com/{}/oauth2/token'.format(self.client_info['tenant_id'])

roles/lib_utils/library/oo_azure_rm_publish_image_facts.py

@@ -63,9 +63,11 @@ class AzurePublisher(object):
     @property
     def token(self):
         '''property for the access_token
-            curl -d \
-            'client_id=<id>&client_secret=<sec>&grant_type=client_credentials&resource=https://cloudpartner.azure.com' \
-            https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/token
+            curl --data-urlencode "client_id=$AZURE_CLIENT_ID" \
+                --data-urlencode "client_secret=$AZURE_CLIENT_SECRET" \
+                --data-urlencode "grant_type=client_credentials" \
+                --data-urlencode "resource=https://cloudpartner.azure.com" \
+                https://login.microsoftonline.com/$AZURE_TENANT_ID/oauth2/token
         '''
         if self._access_token is None:
             url = 'https://login.microsoftonline.com/{}/oauth2/token'.format(self.client_info['tenant_id'])