From db026247dc2b2aadc45c7d6f60f4c949147ce5ea Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Wed, 14 Dec 2016 23:40:58 +0000
Subject: [PATCH] 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 52d5e432fa772a3f3b029edd349f9ca25f2d768d.
---
 playbooks/groups/buildvm.yml                  |  8 ---
 playbooks/groups/osbs-cluster.yml             |  8 ---
 .../files/osbs-site-customize.json            | 19 ++++++
 roles/osbs-client/tasks/main.yml              |  4 +-
 .../templates/osbs-site-customize.json.j2     | 61 -------------------
 5 files changed, 21 insertions(+), 79 deletions(-)
 create mode 100644 roles/osbs-client/files/osbs-site-customize.json
 delete mode 100644 roles/osbs-client/templates/osbs-site-customize.json.j2

diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index ad49d2955a..407aa6038a 100644
--- a/playbooks/groups/buildvm.yml
+++ b/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 }}",
diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index 7168c87e86..494e990b1f 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/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 }}",
diff --git a/roles/osbs-client/files/osbs-site-customize.json b/roles/osbs-client/files/osbs-site-customize.json
new file mode 100644
index 0000000000..8e4ef749a9
--- /dev/null
+++ b/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": [
+    ]
+}
diff --git a/roles/osbs-client/tasks/main.yml b/roles/osbs-client/tasks/main.yml
index 326107b41d..120ec95156 100644
--- a/roles/osbs-client/tasks/main.yml
+++ b/roles/osbs-client/tasks/main.yml
@@ -13,8 +13,8 @@
     state: directory
 
 - name: Upload OSBS Site Customizations plugin conf
-  template:
-    src: "osbs-site-customize.json.j2"
+  copy:
+    src: "osbs-site-customize.json"
     dest: "/etc/osbs/input/prod_customize.json"
     mode: 0400
 
diff --git a/roles/osbs-client/templates/osbs-site-customize.json.j2 b/roles/osbs-client/templates/osbs-site-customize.json.j2
deleted file mode 100644
index 0692dbb219..0000000000
--- a/roles/osbs-client/templates/osbs-site-customize.json.j2
+++ /dev/null
@@ -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
-            }
-        }
-    ]
-}