From 76c44eea7d2d8bbb1f2e26a9f8cd87c2fd1d8dbd Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Wed, 10 Oct 2012 21:50:55 +0000 Subject: [PATCH] delete openshift-el6.yml move tasks into jenkins-slave --- playbooks/jenkins_slave_el6.yml | 66 ++++++++++++++++++- tasks/openshift-el6.yml | 112 -------------------------------- 2 files changed, 63 insertions(+), 115 deletions(-) delete mode 100644 tasks/openshift-el6.yml diff --git a/playbooks/jenkins_slave_el6.yml b/playbooks/jenkins_slave_el6.yml index 73d847e522..6e8d594ca4 100644 --- a/playbooks/jenkins_slave_el6.yml +++ b/playbooks/jenkins_slave_el6.yml @@ -9,8 +9,68 @@ tasks: - include: $tasks/cloud_setup_basic.yml - - include: $tasks/jenkins_slave.yml - - + - name: install pkgs for jenkins + action: yum state=installed pkg=$item + with_items: + - vim + - java-1.7.0-openjdk + - subversion + - bzr + - git + - rpmlint + - mercurial + - mock + - python-bugzilla + - python-straight-plugin + - python-pip + - python-virtualenv + - python-coverage + - pylint + - python-argparse + - python-nose + - python-BeautifulSoup + - python-fedora + tags: + - packages + + - name: install pkgs for jenkins for fedora systems + action: yum state=installed pkg=$item + only_if: '$is_fedora' + with_items: + - python3 + - python-nose-cover3 + - python3-nose-cover3 + tags: + - packages + + - name: set the hostname to jenkins-osversion + action: command hostname jenkins-${dist_tag} + tags: + - config + + - name: setup jenkins_slave user + action: user name=jenkins_slave state=present createhome=yes system=no password=$jenkins_slave_pw + + - name: jenkins_slave to mock group + action: user name=jenkins_slave groups=mock + + - name: add .gitconfig for jenkins_slave user + action: template src=$files/jenkins/gitconfig dest=/home/jenkins_slave/.gitconfig owner=jenkins_slave group=jenkins_slave mode=664 + tags: + - config + + - name: template sshd_config + action: template src=$item dest=/etc/ssh/sshd_config mode=0600 owner=root group=root + first_available_file: + - $files/jenkins/sshd_config_slave.$ansible_distribution + - $files/jenkins/sshd_config_slave + notify: + - restart sshd + tags: + - config + + - name: mkdir dir for jenkins data + action: file state=directory path=/mnt/jenkins owner=jenkins_slave group=jenkins_slave + handlers: - include: $handlers/restart_services.yml diff --git a/tasks/openshift-el6.yml b/tasks/openshift-el6.yml deleted file mode 100644 index 8048611a51..0000000000 --- a/tasks/openshift-el6.yml +++ /dev/null @@ -1,112 +0,0 @@ -# setup openshift broker on el6 ---- -- name: set the hostname to openshift- - action: command hostname openshift-${dist_tag} - tags: - - config - -- name: setup openshift and jenkins repos - action: copy src=$files/openshift/$item dest=/etc/yum.repos.d/$item - with_items: - - openshift-el6.repo - - jenkins.repo - -- name: install openshift pkg core - action: yum state=installed name=$item - with_items: - - mcollective - - mcollective-qpid-plugin - - mongodb - - qpid-cpp-server - - rubygem-gearchanger-mcollective-plugin - - rubygem-swingshift-mongo-plugin - - rubygem-uplift-bind-plugin - - rhc - - stickshift-broker - -- name: set selinux bools appropriately - action: seboolean state=true persistent=yes name=$item - with_items: - - httpd_unified - - httpd_can_network_connect - - httpd_can_network_relay - - named_write_master_zones - - allow_ypbind - -- name: selinux module install - stickshift - action: command semodule -i /usr/share/selinux/packages/rubygem-stickshift-common/stickshift.pp - -- name: selinux module disable - passenger - action: command semodule -d passenger - ignore_errors: True - -- name: selinux module install - other passenger - action: command semodule -i /usr/share/selinux/packages/rubygem-passenger/rubygem-passenger.pp - -- name: fix up files for selinux - action: command $item - with_items: - - "fixfiles -R rubygem-passenger restore" - - "fixfiles -R mod_passenger restore" - - "restorecon -rv /var/run" - - "restorecon -rv /usr/lib/ruby/gems/1.8/gems/passenger-*" - - "restorecon -rv /usr/sbin/mcollectived /var/log/mcollective.log /run/mcollective.pid" - -- name: mongodb.conf - action: copy src=$files/openshift/mongodb.conf dest=/etc/mongodb.conf backup=true - tags: - - mongo - -- name: mongod service start - action: service name=mongod state=running enabled=yes - tags: - - mongo - -- name: mongo/openshift account setup script - action: template src=$files/openshift/mongo-acct.sh dest=/root/mongo-acct.sh mode=0700 - tags: - - mongo - -- name: mongo/openshift account setup - action: command creates=/etc/mongo-acct-setup /root/mongo-acct.sh - tags: - - mongo - -- name: clear file mongo acct file - action: file state=absent path=/root/mongo-acct.sh - tags: - - mongo - -- name: poke holes in the firewall - action: command lokkit $item - with_items: - - --service=ssh - - --service=https - - --service=http - - --service=dns - - --port=5672:tcp - -- name: put our external ip into /etc/hosts as 'openshift-el6' - action: lineinfile dest=/etc/hosts state=present line='${inventory_hostname} openshift-el6' regexp='${inventory_hostname}.*' - -- name: enable services until I turn peach - action: service state=restarted enabled=yes name=$item - with_items: - - httpd - - named - - qpidd - - stickshift-broker - -- name: disable mcollective - action: service state=stopped enabled=no name=mcollective - -- name: mcollective client setup - action: template src=$files/openshift/mcollective-client.cfg dest=/etc/mcollective/client.cfg - -- name: qpidd.conf - action: copy src=$files/openshift/qpidd.conf dest=/etc/qpidd.conf - -- name: stickshift broker gemfile - action: copy src=$files/openshift/Gemfile dest=/var/www/stickshift/broker/Gemfile owner=apache group=apache mode=0640 - - \ No newline at end of file