From 8c730e56f52d4e1ed121a1c6927ce778d80141c8 Mon Sep 17 00:00:00 2001 From: Alexander Pavlenko Date: Tue, 2 Apr 2013 16:10:04 +0400 Subject: [PATCH] add MCollective and Raemon to the build --- mirror/gems/module.mk | 9 ++++++--- naily/lib/naily/version.rb | 2 +- packages/gems/module.mk | 15 +++++++++++---- packages/rpm/module.mk | 7 +++++++ packages/rpm/specs/rbenv-ruby-1.9.3-p392.spec | 8 ++++---- puppet/mcollective/manifests/rabbitmq.pp | 6 +++--- puppet/nailgun/examples/site.pp | 2 +- puppet/nailgun/manifests/mcollective.pp | 4 ++-- requirements-rpm.txt | 4 +--- requirements-src.txt | 4 +++- sandbox.mk | 5 +++++ 11 files changed, 44 insertions(+), 22 deletions(-) diff --git a/mirror/gems/module.mk b/mirror/gems/module.mk index 3ec8bda93f..60e9eedf91 100644 --- a/mirror/gems/module.mk +++ b/mirror/gems/module.mk @@ -10,8 +10,10 @@ $(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile: $(call depv,MIRROR_GEMS) $(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile: $(BUILD_DIR)/packages/gems/build.done mkdir -p $(@D) echo -n > $@ - echo "source \"file://$(SOURCE_DIR)/$(LOCAL_MIRROR_GEMS)\"" >> $@ - echo "gem 'naily'" >> $@ + for i in $(MIRROR_GEMS); do \ + echo "source \"$$i\"" >> $@; \ + done + echo "gem 'naily', '$(NAILY_VERSION)'" >> $@ $(ACTION.TOUCH) $(BUILD_DIR)/mirror/gems/gems-bundle-gemfile.done: \ @@ -27,7 +29,8 @@ $(BUILD_DIR)/mirror/gems/gems-bundle-gemfile.done: \ $(BUILD_DIR)/mirror/gems/gems-bundle.done: $(BUILD_DIR)/mirror/gems/gems-bundle-gemfile.done ( cd $(BUILD_DIR)/mirror/gems/gems-bundle && bundle package ) ( cd $(BUILD_DIR)/mirror/gems/gems-bundle/naily && bundle package ) - ( cd $(BUILD_DIR)/mirror/gems/gems-bundle/vendor/cache/ && gem fetch -v 1.3.4 bundler ) + ( cd $(BUILD_DIR)/mirror/gems/gems-bundle/vendor/cache/ && \ + gem fetch `for i in $(MIRROR_GEMS); do echo -n "--source $$i "; done` -v 1.3.4 bundler ) $(ACTION.TOUCH) $(BUILD_DIR)/mirror/gems/build.done: $(call depv,LOCAL_MIRROR_GEMS) diff --git a/naily/lib/naily/version.rb b/naily/lib/naily/version.rb index be8646a9a9..c5670f6bb3 100644 --- a/naily/lib/naily/version.rb +++ b/naily/lib/naily/version.rb @@ -1,3 +1,3 @@ module Naily - VERSION = '0.0.1' + VERSION = '0.1.0' end diff --git a/packages/gems/module.mk b/packages/gems/module.mk index 28d1639e50..fd59082b06 100644 --- a/packages/gems/module.mk +++ b/packages/gems/module.mk @@ -6,10 +6,10 @@ include $(SOURCE_DIR)/astute/module.mk $(BUILD_DIR)/packages/gems/build.done: \ $(BUILD_DIR)/packages/gems/naily-$(NAILY_VERSION).gem \ - $(BUILD_DIR)/packages/gems/astute-$(ASTUTE_VERSION).gem + $(BUILD_DIR)/packages/gems/astute-$(ASTUTE_VERSION).gem \ + $(BUILD_DIR)/packages/gems/raemon-0.3.0.gem mkdir -p $(LOCAL_MIRROR_GEMS)/gems - find $(BUILD_DIR)/packages/gems/ ! -name "build.done" \ - -exec cp {} $(LOCAL_MIRROR_GEMS)/gems \; + cp $(BUILD_DIR)/packages/gems/*.gem $(LOCAL_MIRROR_GEMS)/gems (cd $(LOCAL_MIRROR_GEMS) && gem generate_index gems) $(ACTION.TOUCH) @@ -19,4 +19,11 @@ astute_version: naily: $(BUILD_DIR)/packages/gems/naily-$(NAILY_VERSION).gem naily_version: - @echo $(NAILY_VERSION) \ No newline at end of file + @echo $(NAILY_VERSION) + +$(BUILD_DIR)/packages/gems/raemon-0.3.0.gem: + unzip -q $(LOCAL_MIRROR_SRC)/b78eaae57c8e836b8018386dd96527b8d9971acc.zip -d $(BUILD_DIR)/packages/gems + rm -rf $(BUILD_DIR)/packages/gems/raemon + mv $(BUILD_DIR)/packages/gems/raemon-b78eaae57c8e836b8018386dd96527b8d9971acc $(BUILD_DIR)/packages/gems/raemon + (cd $(BUILD_DIR)/packages/gems/raemon && gem build raemon.gemspec) + cp $(BUILD_DIR)/packages/gems/raemon/raemon-0.3.0.gem $(BUILD_DIR)/packages/gems diff --git a/packages/rpm/module.mk b/packages/rpm/module.mk index 2752369b47..0d425e02e3 100644 --- a/packages/rpm/module.mk +++ b/packages/rpm/module.mk @@ -64,6 +64,13 @@ $(BUILD_DIR)/packages/rpm/sandbox-packages.done: \ sudo cp $(SOURCE_DIR)/packages/rpm/specs/rbenv-ruby-1.9.3-p392.spec $(SANDBOX)/tmp sudo chroot $(SANDBOX) rpmbuild -vv --define "_topdir /tmp" -ba /tmp/rbenv-ruby-1.9.3-p392.spec + sudo unzip -q $(SANDBOX)/tmp/SOURCES/9f8d2ec75ba326d2a37884224698f3f96ff01629.zip -d $(SANDBOX)/tmp/SOURCES + sudo rm -rf $(SANDBOX)/tmp/SOURCES/mcollective + sudo mv $(SANDBOX)/tmp/SOURCES/marionette-collective-9f8d2ec75ba326d2a37884224698f3f96ff01629 $(SANDBOX)/tmp/SOURCES/mcollective + sudo chroot $(SANDBOX) sh -c "mkdir -p ~/rpmbuild/SOURCES ~/rpmbuild/SPECS && cd /tmp/SOURCES/mcollective && rake rpm && rake gem" + cp $(SANDBOX)/tmp/SOURCES/mcollective/build/*.rpm $(BUILD_DIR)/packages/rpm/RPMS/x86_64/ + cp $(SANDBOX)/tmp/SOURCES/mcollective/build/*.gem $(LOCAL_MIRROR_GEMS)/gems/ + cp $(SANDBOX)/tmp/RPMS/x86_64/* $(BUILD_DIR)/packages/rpm/RPMS/x86_64/ sudo sh -c "$${SANDBOX_DOWN}" $(ACTION.TOUCH) diff --git a/packages/rpm/specs/rbenv-ruby-1.9.3-p392.spec b/packages/rpm/specs/rbenv-ruby-1.9.3-p392.spec index c38847e692..b64163af6c 100644 --- a/packages/rpm/specs/rbenv-ruby-1.9.3-p392.spec +++ b/packages/rpm/specs/rbenv-ruby-1.9.3-p392.spec @@ -12,10 +12,10 @@ Ruby 1.9.3-p392 inside rbenv environment rm -rf "%{name}-%{version}" mkdir %{name}-%{version} cd %{name}-%{version} -unzip %{_sourcedir}/382db59cd0c16518d0cec0974e220a2c46aa7a25.zip - mv rbenv-382db59cd0c16518d0cec0974e220a2c46aa7a25 rbenv -unzip %{_sourcedir}/1fb955eead087646f4d73ac36786432c380309a9.zip - mv ruby-build-1fb955eead087646f4d73ac36786432c380309a9 ruby-build +unzip -q %{_sourcedir}/382db59cd0c16518d0cec0974e220a2c46aa7a25.zip + mv -f rbenv-382db59cd0c16518d0cec0974e220a2c46aa7a25 rbenv +unzip -q %{_sourcedir}/1fb955eead087646f4d73ac36786432c380309a9.zip + mv -f ruby-build-1fb955eead087646f4d73ac36786432c380309a9 ruby-build ln -fs `pwd`/rbenv /opt %build diff --git a/puppet/mcollective/manifests/rabbitmq.pp b/puppet/mcollective/manifests/rabbitmq.pp index cd22ea76a3..f3cbd654a0 100644 --- a/puppet/mcollective/manifests/rabbitmq.pp +++ b/puppet/mcollective/manifests/rabbitmq.pp @@ -44,10 +44,10 @@ class mcollective::rabbitmq( notify => Service["rabbitmq-server"], } - $actualvhost = "/" + $actual_vhost = "/" } else { - access_to_rabbimq_port { "${port}_tcp": port => $port } + access_to_rabbitmq_port { "${port}_tcp": port => $port } class { 'rabbitmq::server': service_ensure => 'running', @@ -69,7 +69,7 @@ class mcollective::rabbitmq( require => Class['rabbitmq::server'], } - rabbitmq_user_permissions { "${user}@${actualvhost}": + rabbitmq_user_permissions { "${user}@${actual_vhost}": configure_permission => '.*', write_permission => '.*', read_permission => '.*', diff --git a/puppet/nailgun/examples/site.pp b/puppet/nailgun/examples/site.pp index 1c539fc472..c001a4f511 100644 --- a/puppet/nailgun/examples/site.pp +++ b/puppet/nailgun/examples/site.pp @@ -33,7 +33,7 @@ node default { class { "nailgun": package => "Nailgun", version => "0.1.0", - naily_version => "0.0.1", + naily_version => "0.1.0", nailgun_group => "nailgun", nailgun_user => "nailgun", venv => "/opt/nailgun", diff --git a/puppet/nailgun/manifests/mcollective.pp b/puppet/nailgun/manifests/mcollective.pp index 9006378082..b2a0042c0b 100644 --- a/puppet/nailgun/manifests/mcollective.pp +++ b/puppet/nailgun/manifests/mcollective.pp @@ -7,7 +7,7 @@ class nailgun::mcollective( class { "mcollective::rabbitmq": user => $mco_user, password => $mco_password, - stomp = false, + stomp => false, } class { "mcollective::client": @@ -15,7 +15,7 @@ class nailgun::mcollective( user => $mco_user, password => $mco_password, host => $ipaddress, - stomp = false, + stomp => false, } } diff --git a/requirements-rpm.txt b/requirements-rpm.txt index 9de46e8231..626a1b77c5 100644 --- a/requirements-rpm.txt +++ b/requirements-rpm.txt @@ -33,9 +33,6 @@ haproxy-1.4.19-1.el6 keepalived-1.2.4-1.el6 make-3.81-20.el6 man-1.6f-30.el6 -mcollective-common-2.3.1-2.el6 -mcollective-2.3.1-2.el6 -mcollective-client-2.3.1-2.el6 memcached-1.4.4-3.el6 mysql-5.1.66-2.el6_3 mysql-devel-5.1.66-2.el6_3 @@ -97,6 +94,7 @@ ruby-rdoc-1.8.7.352-7.el6_2 ruby-ri-1.8.7.352-7.el6_2 ruby-shadow-1.4.1-13.el6 rubygem-mongrel-1.1.5-3.el6 +rubygem-stomp-1.2.2-1.el6 rubygems-1.3.7-1.el6 scapy-2.0.0.10-5.el6 screen-4.0.3-16.el6 diff --git a/requirements-src.txt b/requirements-src.txt index 5f5a8bc341..ade317a5d0 100644 --- a/requirements-src.txt +++ b/requirements-src.txt @@ -1,7 +1,9 @@ https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz http://www.tcpdump.org/release/libpcap-1.3.0.tar.gz http://pypcap.googlecode.com/files/pypcap-1.1.tar.gz +https://github.com/AlexanderPavlenko/raemon/archive/b78eaae57c8e836b8018386dd96527b8d9971acc.zip +https://github.com/AlexanderPavlenko/marionette-collective/archive/9f8d2ec75ba326d2a37884224698f3f96ff01629.zip https://github.com/sstephenson/rbenv/archive/382db59cd0c16518d0cec0974e220a2c46aa7a25.zip https://github.com/sstephenson/ruby-build/archive/1fb955eead087646f4d73ac36786432c380309a9.zip http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz -http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p392.tar.gz \ No newline at end of file +http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p392.tar.gz diff --git a/sandbox.mk b/sandbox.mk index 1e4438dd9f..911e9fcac2 100644 --- a/sandbox.mk +++ b/sandbox.mk @@ -36,6 +36,11 @@ SANDBOX_PACKAGES:=\ tar \ postgresql-devel \ openssl-devel \ + ruby \ + ruby-devel \ + rubygems \ + rubygem-rake \ + which \ define SANDBOX_UP