Merge pull request #17 from IPvSean/master

syncing seans fork

galaxy.yml

@@ -1,11 +1,13 @@
 ---
 namespace: ansible
 name: product_demos
-version: 1.2.1
+version: 1.2.4
 readme: README.md
 
 authors:
   - Sean Cavanaugh <seanc@redhat.com> @IPvSean
+  - David Rojas <drojas@redhat.com>
+  - Colin McNaughton <cmcnaugh@redhat.com>
 
 description: repository of demos to showcase Ansible features.
 

roles/install_demo/tasks/azure.yml

@@ -2,7 +2,7 @@
 - name: add azure credential
   tower_credential:
     name: azure_credential
-    description: Azure Service Principle 
+    description: Azure Service Principle
     organization: "{{ vars[demo].project.organization }}"
     state: present
     kind: azure_rm
@@ -13,9 +13,4 @@
     tower_username: "{{ my_tower_username }}"
     tower_password: "{{ my_tower_password }}"
     tower_host: "{{ my_tower_host }}"
-
-
-  
-      
-
-
+    validate_certs: false

roles/install_demo/tasks/main.yml

@@ -20,10 +20,11 @@
       - "demo must be defined and be one of: {{ demo_list }}"
       - "full list can be found on https://github.com/ansible/product-demos"
 
-- name: install Azure cred 
-  include_tasks: azure_cred.yml
-  when:
-    - azure_demo == True
+- name: setup public cloud credentials
+  include_tasks: "{{item}}"
+  with_first_found:
+    - "{{role_path}}/tasks/{{public_cloud}}.yml"
+    - "{{role_path}}/tasks/unsupported_cloud.yml"
 
 - name: install all job templates
   include_tasks: job_template_loop.yml

roles/install_demo/tasks/unsupported_cloud.yml

@@ -0,0 +1,16 @@
+- name: public cloud not supported
+  debug:
+    msg: "there is no public cloud credentials for this install, installing dummy creds"
+
+- name: add azure credential
+  tower_credential:
+    name: azure_credential
+    description: Azure Service Principle
+    organization: "{{ vars[demo].project.organization }}"
+    state: present
+    kind: azure_rm
+    subscription: "please replace me"
+    tower_username: "{{ my_tower_username }}"
+    tower_password: "{{ my_tower_password }}"
+    tower_host: "{{ my_tower_host }}"
+    validate_certs: false