From a4f319d83d3bf7d6ed308980cf58414c54ef27fe Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Fri, 3 May 2013 17:23:32 +0000 Subject: [PATCH] remove some old files rename a bunch of places from '-' to '_' --- ...emp-instance.yml => el6_temp_instance.yml} | 0 ...emp-instance.yml => f19_temp_instance.yml} | 0 ...-instance.yml => fedora_temp_instance.yml} | 0 .../{host-reboot.yml => host_reboot.yml} | 0 playbooks/openshift-el6.yml | 125 ------------------ ...{package-update.yml => package_update.yml} | 0 ...ision.yml => transient_post_provision.yml} | 0 .../{vhost-reboot.yml => vhost_reboot.yml} | 0 .../{vhost-update.yml => vhost_update.yml} | 0 9 files changed, 125 deletions(-) rename playbooks/{el6-temp-instance.yml => el6_temp_instance.yml} (100%) rename playbooks/{f19-temp-instance.yml => f19_temp_instance.yml} (100%) rename playbooks/{fedora-temp-instance.yml => fedora_temp_instance.yml} (100%) rename playbooks/{host-reboot.yml => host_reboot.yml} (100%) delete mode 100644 playbooks/openshift-el6.yml rename playbooks/{package-update.yml => package_update.yml} (100%) rename playbooks/{transient-post-provision.yml => transient_post_provision.yml} (100%) rename playbooks/{vhost-reboot.yml => vhost_reboot.yml} (100%) rename playbooks/{vhost-update.yml => vhost_update.yml} (100%) diff --git a/playbooks/el6-temp-instance.yml b/playbooks/el6_temp_instance.yml similarity index 100% rename from playbooks/el6-temp-instance.yml rename to playbooks/el6_temp_instance.yml diff --git a/playbooks/f19-temp-instance.yml b/playbooks/f19_temp_instance.yml similarity index 100% rename from playbooks/f19-temp-instance.yml rename to playbooks/f19_temp_instance.yml diff --git a/playbooks/fedora-temp-instance.yml b/playbooks/fedora_temp_instance.yml similarity index 100% rename from playbooks/fedora-temp-instance.yml rename to playbooks/fedora_temp_instance.yml diff --git a/playbooks/host-reboot.yml b/playbooks/host_reboot.yml similarity index 100% rename from playbooks/host-reboot.yml rename to playbooks/host_reboot.yml diff --git a/playbooks/openshift-el6.yml b/playbooks/openshift-el6.yml deleted file mode 100644 index 4a5af2e4a8..0000000000 --- a/playbooks/openshift-el6.yml +++ /dev/null @@ -1,125 +0,0 @@ -# restricted to run on cloud instances only -- hosts: 209.132.184.* - user: root - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - $private/vars.yml - - $vars/${ansible_distribution}.yml - - tasks: - - include: $tasks/cloud_setup_basic.yml - - # 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 - - - - handlers: - - include: $handlers/restart_services.yml diff --git a/playbooks/package-update.yml b/playbooks/package_update.yml similarity index 100% rename from playbooks/package-update.yml rename to playbooks/package_update.yml diff --git a/playbooks/transient-post-provision.yml b/playbooks/transient_post_provision.yml similarity index 100% rename from playbooks/transient-post-provision.yml rename to playbooks/transient_post_provision.yml diff --git a/playbooks/vhost-reboot.yml b/playbooks/vhost_reboot.yml similarity index 100% rename from playbooks/vhost-reboot.yml rename to playbooks/vhost_reboot.yml diff --git a/playbooks/vhost-update.yml b/playbooks/vhost_update.yml similarity index 100% rename from playbooks/vhost-update.yml rename to playbooks/vhost_update.yml