Revert "override osbs default input.json to ensure secure comms everywhere"

This breaks OSBS, will debug and re-apply later when fixed.

This reverts commit 52d5e432fa.

playbooks/groups/buildvm.yml

@@ -82,10 +82,6 @@
           verbose: 0,
           build_json_dir: '/etc/osbs/input/',
           openshift_required_version: 1.1.0,
-          ipa_realm: "{{ipa_realm}}",
-          osbs_url: "{{osbs_url}}",
-          registry: "{{docker_registry}}",
-          parent_registry: "{{source_registry}}"
         },
         default: {
           username: "{{ osbs_koji_stg_username }}",
@@ -118,10 +114,6 @@
           verbose: 0,
           build_json_dir: '/etc/osbs/input/',
           openshift_required_version: 1.1.0,
-          ipa_realm: "{{ipa_realm}}",
-          osbs_url: "{{osbs_url}}",
-          registry: "{{docker_registry}}",
-          parent_registry: "{{source_registry}}"
         },
         default: {
           username: "{{ osbs_koji_prod_username }}",

playbooks/groups/osbs-cluster.yml

@@ -523,10 +523,6 @@
           verbose: 0,
           build_json_dir: '/etc/osbs/input/',
           openshift_required_version: 1.1.0,
-          ipa_realm: "{{ipa_realm}}",
-          osbs_url: "{{osbs_url}}",
-          registry: "{{docker_registry}}",
-          parent_registry: "{{source_registry}}"
         },
         default: {
           username: "{{ osbs_koji_stg_username }}",
@@ -559,10 +555,6 @@
           verbose: 0,
           build_json_dir: '/etc/osbs/input/',
           openshift_required_version: 1.1.0,
-          ipa_realm: "{{ipa_realm}}",
-          osbs_url: "{{osbs_url}}",
-          registry: "{{docker_registry}}",
-          parent_registry: "{{source_registry}}"
         },
         default: {
           username: "{{ osbs_koji_prod_username }}",

roles/osbs-client/files/osbs-site-customize.json

@@ -0,0 +1,19 @@
+{
+    "disable_plugins": [
+        {
+            "plugin_type": "postbuild_plugins",
+            "plugin_name": "pulp_push"
+        },
+        {
+            "plugin_type": "postbuild_plugins",
+            "plugin_name": "pulp_sync"
+        },
+        {
+            "plugin_type": "postbuild_plugins",
+            "plugin_name": "pulp_pull"
+        }
+    ],
+
+    "enable_plugins": [
+    ]
+}

roles/osbs-client/tasks/main.yml

@@ -13,8 +13,8 @@
     state: directory
 
 - name: Upload OSBS Site Customizations plugin conf
-  template:
+  copy:
-    src: "osbs-site-customize.json.j2"
+    src: "osbs-site-customize.json"
     dest: "/etc/osbs/input/prod_customize.json"
     mode: 0400
 

roles/osbs-client/templates/osbs-site-customize.json.j2

@@ -1,61 +0,0 @@
-{
-    "disable_plugins": [
-        {
-            "plugin_type": "postbuild_plugins",
-            "plugin_name": "pulp_push"
-        },
-        {
-            "plugin_type": "postbuild_plugins",
-            "plugin_name": "pulp_sync"
-        },
-        {
-            "plugin_type": "postbuild_plugins",
-            "plugin_name": "pulp_pull"
-        }
-    ],
-
-    "enable_plugins": [
-       {
-            "plugin_type": "postbuild_plugins",
-            "plugin_name": "tag_and_push",
-            "plugin_args": {
-                "registries": {
-                    "{{general.registry}}": {
-                        "insecure": false
-                    }
-                }
-            }
-        },
-        {
-            "plugin_type": "prebuild_plugins",
-            "plugin_name": "pull_base_image",
-            "plugin_args": {
-                "parent_registry_insecure": false,
-                "parent_registry": "{{general.parent_registry}}"
-            }
-        },
-        {
-            "plugin_type": "exit_plugins",
-            "plugin_name": "koji_promote",
-            "plugin_args": {
-                  "kojihub": "{{default.koji_hub}}",
-                  "verify_ssl": true,
-                  "target": "rawhide-docker-candidate",
-                  "url": "{{default.openshift_url}}",
-                  "blocksize": 10485760,
-                  "koji_principal": "osbs/{{general.osbs_url}}@{{general.ipa_realm}}",
-                  "koji_keytab": "FILE:/etc/krb5.osbs_{{general.osbs_url}}.keytab",
-                  "use_auth": true
-            }
-        },
-        {
-            "plugin_type": "exit_plugins",
-            "plugin_name": "store_metadata_in_osv3",
-            "plugin_args": {
-                "url": "{{default.openshift_url}}",
-                "verify_ssl": false,
-                "use_auth": true
-            }
-        }
-    ]
-}