diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml index 8dbc9d1dbb..b945dece6a 100644 --- a/playbooks/groups/osbs-master.yml +++ b/playbooks/groups/osbs-master.yml @@ -108,12 +108,7 @@ role: osbs-common, osbs_manage_firewalld: false, } - - { - role: osbs-install-openshift, - install_openshift_method: "copr", - osbs_update_packages: false, - osbs_openshift_loglevel: 0 - } + - osbs-install-openshift - { role: osbs-master, osbs_master_export_port: true, diff --git a/roles/osbs-install-openshift/defaults/main.yml b/roles/osbs-install-openshift/defaults/main.yml index c5c9ff7372..fefe12d70e 100644 --- a/roles/osbs-install-openshift/defaults/main.yml +++ b/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 diff --git a/roles/osbs-install-openshift/tasks/main.yml b/roles/osbs-install-openshift/tasks/main.yml index 3c45a99096..2bcd73c73d 100644 --- a/roles/osbs-install-openshift/tasks/main.yml +++ b/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' diff --git a/roles/osbs-install-openshift/templates/origin-master.j2 b/roles/osbs-install-openshift/templates/origin-master.j2 deleted file mode 100644 index a5ffc6123b..0000000000 --- a/roles/osbs-install-openshift/templates/origin-master.j2 +++ /dev/null @@ -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 \ No newline at end of file diff --git a/roles/osbs-install-openshift/templates/origin-node.j2 b/roles/osbs-install-openshift/templates/origin-node.j2 deleted file mode 100644 index 05d9eee353..0000000000 --- a/roles/osbs-install-openshift/templates/origin-node.j2 +++ /dev/null @@ -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