updated merge

setup-base.yml

diff --git a/setup-base.yml b/setup-base.yml
index 0ac48c6..43ac4fc 100644
--- a/setup-base.yml
+++ b/setup-base.yml
@@ -13,36 +13,71 @@
     with_items: '{{ configuration_folders }}'
     tags: ['config']
 
-  - name: Git checkout of configuration repositories
-    tags: ['config']
-    become: false
-    ignore_errors: yes
-    git:
-      repo: '{{ repository_secure_endpoint_ssh }}/{{ item.repo_name }}.git'
-      dest: "{{ item.workspace }}/{{ item.repo_name }}"
-      accept_hostkey: yes
-    with_items: "{{ config_repos }}"
+  - block:
+    - name: Git checkout of configuration repositories
+      tags: ['config']
+      become: false
+      ignore_errors: yes
+      git:
+        repo: '{{ repository_secure_endpoint_ssh }}/{{ item.repo_name }}.git'
+        dest: "{{ item.workspace }}/{{ item.repo_name }}"
+        accept_hostkey: yes
+      with_items: "{{ config_repos }}"
 
-  - name: Git checkout of playbook repositories
-    tags: ['playbooks']
-    become: false
-    git:
-      repo: '{{ repository_secure_endpoint_ssh }}/{{ item.repo_name }}.git'
-      dest: "{{ item.workspace }}/{{ item.repo_name }}"
-      accept_hostkey: yes
-    with_items: "{{ playbook_repos }}"
+    - name: Git checkout of playbook repositories
+      tags: ['playbooks']
+      become: false
+      git:
+        repo: '{{ repository_secure_endpoint_ssh }}/{{ item.repo_name }}.git'
+        dest: "{{ item.workspace }}/{{ item.repo_name }}"
+        accept_hostkey: yes
+      with_items: "{{ playbook_repos }}"
 
-  - name: Git checkout of role repositories
-    tags: ['roles']
-    become: false
-    git:
-      repo: '{{ repository_secure_endpoint_ssh }}/{{ item.repo_name }}.git'
-      dest: "{{ item.workspace }}/{{ item.repo_name }}"
-      accept_hostkey: yes
-      update: yes
-      version: master
-    with_items: "{{ role_repos }}"
-    when: role_repos is defined
+    - name: Git checkout of role repositories
+      tags: ['roles']
+      become: false
+      git:
+        repo: '{{ repository_secure_endpoint_ssh }}/{{ item.repo_name }}.git'
+        dest: "{{ item.workspace }}/{{ item.repo_name }}"
+        accept_hostkey: yes
+        update: yes
+        version: master
+      with_items: "{{ role_repos }}"
+      when: role_repos is defined
+    when: checkout_type | trim == 'ssh' | default('ssh')
+
+  - block:
+    - name: Git checkout of configuration repositories
+      tags: ['config']
+      become: false
+      ignore_errors: yes
+      git:
+        repo: '{{ repository_secure_endpoint_https }}/{{ item.repo_name }}.git'
+        dest: "{{ item.workspace }}/{{ item.repo_name }}"
+        accept_hostkey: yes
+      with_items: "{{ config_repos }}"
+
+    - name: Git checkout of playbook repositories
+      tags: ['playbooks']
+      become: false
+      git:
+        repo: '{{ repository_secure_endpoint_https }}/{{ item.repo_name }}.git'
+        dest: "{{ item.workspace }}/{{ item.repo_name }}"
+        accept_hostkey: yes
+      with_items: "{{ playbook_repos }}"
+
+    - name: Git checkout of role repositories
+      tags: ['roles']
+      become: false
+      git:
+        repo: '{{ repository_secure_endpoint_https }}/{{ item.repo_name }}.git'
+        dest: "{{ item.workspace }}/{{ item.repo_name }}"
+        accept_hostkey: yes
+        update: yes
+        version: master
+      with_items: "{{ role_repos }}"
+      when: role_repos is defined
+    when: checkout_type | trim == 'https'
 
   - name: Add empty credentials.yml file to .apigee
     copy: