Revert "osbs-master/osbs-install-openshift: set openshift loglevel in sysconfig"

This reverts commit 2edd5273d8.

playbooks/groups/osbs-master.yml

@@ -108,12 +108,7 @@
       role: osbs-common,
         osbs_manage_firewalld: false,
     }
-    - {
+    - osbs-install-openshift
-      role: osbs-install-openshift,
-        install_openshift_method: "copr",
-        osbs_update_packages: false,
-        osbs_openshift_loglevel: 0
-    }
     - {
         role: osbs-master,
           osbs_master_export_port: true,

roles/osbs-install-openshift/defaults/main.yml

@@ -24,5 +24,3 @@ install_openshift_source_rpmbuild_dir: "{{ ansible_env.HOME }}/rpmbuild"
 
 # update package from copr to the latest version?
 osbs_update_packages: false
-
-osbs_openshift_loglevel: 0

roles/osbs-install-openshift/tasks/main.yml

@@ -1,14 +1,4 @@
 ---
-- name: install master sysconfig
-  template:
-    src: "origin-master.j2"
-    dest: "/etc/sysconfig/origin-master"
-
-- name: install node sysconfig
-  template:
-    src: "origin-node.j2"
-    dest: "/etc/sysconfig/origin-node"
-
 - include: method_copr.yml
   when: install_openshift_method == 'copr'
 

roles/osbs-install-openshift/templates/origin-master.j2

@@ -1,9 +0,0 @@
-OPTIONS="--loglevel={{osbs_openshift_loglevel}}"
-CONFIG_FILE=/etc/origin/master/master-config.yaml
-
-# Proxy configuration
-# Origin uses standard HTTP_PROXY environment variables. Be sure to set
-# NO_PROXY for your master
-#NO_PROXY=master.example.com
-#HTTP_PROXY=http://USER:PASSWORD@IPADDR:PORT
-#HTTPS_PROXY=https://USER:PASSWORD@IPADDR:POR

roles/osbs-install-openshift/templates/origin-node.j2

@@ -1,22 +0,0 @@
-OPTIONS="--loglevel={{osbs_openshift_loglevel}}"
-# /etc/origin/node/ should contain the entire contents of
-# /var/lib/origin.local.certificates/node-${node-fqdn} generated by
-# running 'atomic-enterprise admin create-node-config' on your master
-#
-# If if your node is running on a separate host you can rsync the contents
-# rsync -a root@atomic-enterprise-master:/var/lib/origin/origin.local.certificates/node-`hostname`/ /etc/origin/node
-CONFIG_FILE=/etc/origin/node/node-config.yaml
-
-# The $DOCKER_NETWORK_OPTIONS variable is used by sdn plugins to set
-# $DOCKER_NETWORK_OPTIONS variable in the /etc/sysconfig/docker-network
-# Most plugins include their own defaults within the scripts
-# TODO: More elegant solution like this
-# https://github.com/coreos/flannel/blob/master/dist/mk-docker-opts.sh
-# DOCKER_NETWORK_OPTIONS='-b=lbr0 --mtu=1450'
-
-# Proxy configuration
-# Origin uses standard HTTP_PROXY environment variables. Be sure to set
-# NO_PROXY for your master
-#NO_PROXY=master.example.com
-#HTTP_PROXY=http://USER:PASSWORD@IPADDR:PORT
-#HTTPS_PROXY=https://USER:PASSWORD@IPADDR:PORT