New version of openshift playbooks better s3 support

reference-architecture/aws-ansible/playbooks/openshift-install.yaml

@@ -39,11 +39,3 @@
       - prerequisite
 
 - include: openshift-setup.yaml
-
-- hosts: primary_master
-  gather_facts: no
-  become: yes
-  vars_files:
-      - vars/main.yaml
-  roles:
-      - openshift-registry

reference-architecture/aws-ansible/playbooks/openshift-setup.yaml

@@ -43,3 +43,14 @@
       - openshift
     osm_use_cockpit: false
     containerized: false
+    openshift_hosted_registry_storage_kind: object
+    openshift_hosted_registry_storage_provider: s3
+    openshift_hosted_registry_storage_s3_accesskey: "{{ hostvars['localhost']['s3user_id'] }}"
+    openshift_hosted_registry_storage_s3_secretkey: "{{ hostvars['localhost']['s3user_secret'] }}"
+    openshift_hosted_registry_storage_s3_bucket: "{{ hostvars['localhost']['s3_bucket_name'] }}"
+    openshift_hosted_registry_storage_s3_region: "{{ hostvars['localhost']['region'] }}"
+    openshift_hosted_registry_storage_s3_chunksize: 26214400
+    openshift_hosted_registry_storage_s3_rootdirectory: /registry
+    openshift_hosted_registry_pullthrough: true
+    openshift_hosted_registry_acceptschema2: true
+    openshift_hosted_registry_enforcequota: true

reference-architecture/aws-ansible/playbooks/roles/prerequisite/tasks/main.yaml

@@ -16,20 +16,3 @@
   with_items:
   - NetworkManager
   when: not openshift.common.is_atomic | bool
-
-- name: Make directory due to using AWS intance roles
-  file:
-    dest: "/etc/origin/cloudprovider"
-    state: directory
-    recurse: yes
-    mode: 0660
-    owner: root
-    group: root
-
-- name: touch file due to using AWS instance roles
-  file:
-    dest: "/etc/origin/cloudprovider/aws.conf"
-    state: touch
-    mode: 0660
-    owner: root
-    group: root