openstack
/
fuel-main
Code Issues Proposed changes

Use a new ruby 2.1 in the master node as a single ruby version 

* remove unused gems;
* remove rbenv env;
* remove ruby compilation;
* use ruby 2.1 for master node.

TODO:
* remove raemon;
* remove build gems for Astute;
* update spec for Astute.

Change-Id: I099e65901ef3cf691f90d5bda4dd2f1a5cb76ea7
Implements: blueprint fuel-new-system-ruby-in-master-node
This commit is contained in:
Vladimir Sharshov 2014-03-21 14:16:21 +04:00
parent 1a1e7857d9
commit 4471a16761
8 changed files with 39 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap/module.mk
View File

@ -71,7 +71,7 @@ pluginconfpath=$(BUILD_DIR)/bootstrap/etc/yum/pluginconf.d
reposdir=$(BUILD_DIR)/bootstrap/etc/yum.repos.d
endef
YUM:=sudo yum -c $(BUILD_DIR)/bootstrap/etc/yum.conf --installroot=$(INITRAMROOT) -y --nogpgcheck
YUM:=sudo yum -c $(BUILD_DIR)/bootstrap/etc/yum.conf --exclude=ruby-2.1.1-1.1.x86_64 --installroot=$(INITRAMROOT) -y --nogpgcheck
KERNEL_PATTERN:=kernel-lt-3.10.*
KERNEL_FIRMWARE_PATTERN:=kernel-lt-firmware-3.10.*

6
iso/ks.template
View File

@ -158,9 +158,9 @@ mlocate
ntp
openssh-clients
policycoreutils
puppet
rubygem-netaddr
rubygem-openstack
ruby21-puppet
ruby21-rubygem-netaddr
ruby21-rubygem-openstack
selinux-policy-targeted
subscription-manager
system-config-firewall-base

16
packages/rpm/module.mk
View File

@ -87,21 +87,6 @@ $(BUILD_DIR)/packages/rpm/rpm-fuelmenu.done: \
sudo sh -c "$${SANDBOX_DOWN}"
$(ACTION.TOUCH)
$(BUILD_DIR)/packages/rpm/rpm-rbenv-ruby.done: SANDBOX:=$(BUILD_DIR)/packages/rpm/SANDBOX
$(BUILD_DIR)/packages/rpm/rpm-rbenv-ruby.done: export SANDBOX_UP:=$(SANDBOX_UP)
$(BUILD_DIR)/packages/rpm/rpm-rbenv-ruby.done: export SANDBOX_DOWN:=$(SANDBOX_DOWN)
$(BUILD_DIR)/packages/rpm/rpm-rbenv-ruby.done: \
$(BUILD_DIR)/packages/rpm/prep.done \
$(SOURCE_DIR)/packages/rpm/specs/rbenv-ruby-1.9.3-p484.spec
sudo sh -c "$${SANDBOX_UP}"
sudo mkdir -p $(SANDBOX)/tmp/SOURCES
sudo cp $(LOCAL_MIRROR_SRC)/* $(SANDBOX)/tmp/SOURCES
sudo cp $(SOURCE_DIR)/packages/rpm/specs/rbenv-ruby-1.9.3-p484.spec $(SANDBOX)/tmp
sudo chroot $(SANDBOX) rpmbuild -vv --define "_topdir /tmp" -ba /tmp/rbenv-ruby-1.9.3-p484.spec
cp $(SANDBOX)/tmp/RPMS/x86_64/rbenv-ruby-*.rpm $(BUILD_DIR)/packages/rpm/RPMS/x86_64/
sudo sh -c "$${SANDBOX_DOWN}"
$(ACTION.TOUCH)
$(BUILD_DIR)/packages/rpm/rpm-nailgun-redhat-license.done: \
$(BUILD_DIR)/packages/rpm/prep.done \
$(SOURCE_DIR)/packages/rpm/specs/nailgun-redhat-license.spec \
@ -117,7 +102,6 @@ $(BUILD_DIR)/packages/rpm/repo.done: \
$(BUILD_DIR)/packages/rpm/rpm-nailgun-mcagents.done \
$(BUILD_DIR)/packages/rpm/rpm-nailgun-net-check.done \
$(BUILD_DIR)/packages/rpm/rpm-nailgun-redhat-license.done \
$(BUILD_DIR)/packages/rpm/rpm-rbenv-ruby.done \
$(BUILD_DIR)/packages/rpm/rpm-fuelmenu.done \
$(BUILD_DIR)/packages/rpm/rpm-python-fuelclient.done
find $(BUILD_DIR)/packages/rpm/RPMS -name '*.rpm' -exec cp -u {} $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/Packages \;

35
packages/rpm/specs/rbenv-ruby-1.9.3-p484.spec
View File

@ -1,35 +0,0 @@
Name: rbenv-ruby-1.9.3-p484
Summary: Ruby 1.9.3-p484 inside rbenv environment
Version: 0.0.1
Release: 1
License: Ruby
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
URL: http://mirantis.com
%description
Ruby 1.9.3-p484 inside rbenv environment
%prep
rm -rf "%{name}-%{version}"
mkdir %{name}-%{version}
cd %{name}-%{version}
unzip -q %{_sourcedir}/382db59cd0c16518d0cec0974e220a2c46aa7a25.zip
mv -f rbenv-382db59cd0c16518d0cec0974e220a2c46aa7a25 rbenv
unzip -q %{_sourcedir}/5ae03b839494d20435faad5bc31e2e95d10c4f33.zip
mv -f ruby-build-5ae03b839494d20435faad5bc31e2e95d10c4f33 ruby-build
ln -fs `pwd`/rbenv /opt
%build
cd %{name}-%{version}
echo "system" > rbenv/version
RUBY_BUILD_CACHE_PATH=%{_sourcedir} ruby-build/bin/ruby-build 1.9.3-p484 /opt/rbenv/versions/1.9.3-p484
%install
mkdir -p %{buildroot}/opt/
cp -r %{name}-%{version}/rbenv %{buildroot}/opt/
%clean
rm -rf "%{buildroot}"
rm -f "/opt/rbenv"
%files
/opt/rbenv

5
requirements-gems.txt
View File

@ -1,4 +1,3 @@
activerecord 3.0.10
amq-client 0.9.12
amq-protocol 1.2.0
amqp 0.9.10
@ -12,7 +11,6 @@ i18n 0.5.0
ipaddress 0.8.0
json 1.6.1
json_pure 1.7.5
kwalify 0.7.2
mcollective-client 2.4.1
mime-types 1.19
mixlib-authentication 1.1.4
@ -20,15 +18,12 @@ mixlib-cli 1.2.2
mixlib-config 1.1.2
mixlib-log 1.4.1
mixlib-shellout 1.0.0
moneta 0.6.0
mysql 2.8.1
net-ssh 2.8.0
net-ssh-gateway 1.1.0
net-ssh-multi 1.1
ohai 6.14.0
polyglot 0.3.3
popen4 0.1.2
rails 3.0.10
rest-client 1.6.7
rethtool 0.0.3
stomp 1.2.16

32
requirements-rpm.txt
View File

@ -443,7 +443,8 @@ rst2pdf-0.16-1.el6
rsync
rsyslog
rsyslog-relp
ruby
ruby-1.8.7.352-13.el6
ruby-irb-1.8.7.352-13.el6
ruby-augeas
ruby-devel
ruby-extlib-0.9.13-5.el6
@ -513,6 +514,35 @@ rubygem-tzinfo-0.3.37-1.el6
rubygem-uuidtools-2.1.2-1.el6
rubygem-yajl-ruby-1.1.0-2~1.el6
rubygems
augeas-libs-1.0.0-5.mira1
libyaml-0.1.3-1.el6
ruby-2.1.1-1.1.x86_64
ruby21-nailgun-mcagents-0.1.0-2
ruby21-rubygem-json-1.6.1-4.6.x86_64
ruby21-puppet-3.4.2-1.mira1.noarch
ruby21-rubygem-eventmachine-1.0.3-4.el6.x86_64
ruby21-rubygem-amqp-0.9.10-1.el6.noarch
ruby21-rubygem-rest-client-1.6.7-2.el6.noarch
ruby21-rubygem-symboltable-1.0.2-1.noarch
ruby21-rubygem-open4-1.3.3-2.el6.noarch
ruby21-rubygem-json_pure-1.8.1-1.el6.noarch
ruby21-facter-1.7.0-1.el6.x86_64
ruby21-hiera-1.3.2-1.el6.noarch
ruby21-rubygem-rgen-0.6.6-1.el6.noarch
ruby21-rubygem-stomp-1.3.2-1.el6.noarch
ruby21-rubygem-raemon-0.3.0-1.el6.noarch
ruby21-rubygem-mcollective-client-2.4.1-1.el6.noarch
ruby21-rubygem-astute-0.0.2-6_7e57598.el6.noarch
ruby21-rubygem-openstack-1.1.2-2.el6.noarch
ruby21-mcollective-2.4.1-1.el6.noarch
ruby21-rubygem-amq-protocol-1.2.0-1.el6.noarch
ruby21-rubygem-mime-types-2.2-3.el6.noarch
ruby21-rubygem-i18n-0.6.9-1.el6.noarch
ruby21-rubygem-activesupport-3.0.10-1.el6.noarch
ruby21-mcollective-common-2.4.1-1.el6.noarch
libselinux-ruby-2.0.94-5.3.el6_4.1.x86_64
ruby21-augeas-0.5.0-17.3.x86_64
ruby21-rubygem-shadow-1.4.1-21.el6.x86_64
#sahara
#sahara-dashboard
scapy-2.0.0.10-5.el6

3
requirements-src.txt
View File

@ -1,9 +1,6 @@
http://www.tcpdump.org/release/libpcap-1.3.0.tar.gz
http://pypcap.googlecode.com/files/pypcap-1.1.tar.gz
https://github.com/dmi-try/raemon/archive/b78eaae57c8e836b8018386dd96527b8d9971acc.zip
https://github.com/sstephenson/rbenv/archive/382db59cd0c16518d0cec0974e220a2c46aa7a25.zip
https://github.com/sstephenson/ruby-build/archive/5ae03b839494d20435faad5bc31e2e95d10c4f33.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-p484.tar.gz
https://github.com/liftoff/GateOne/archive/bb003114b4e84e9425fd02fd1ee615d4dd2113e7.zip
https://github.com/e0ne/python-heatclient/archive/7685f8ac19482086f72d6d733fc21a31c5e35d16.zip

5
sandbox.mk
View File

@ -45,6 +45,7 @@ SANDBOX_PACKAGES:=\
define SANDBOX_UP
echo "Starting SANDBOX up"
mkdir -p $(SANDBOX)/etc/yum.repos.d
cat > $(SANDBOX)/etc/yum.conf <<EOF
$(sandbox_yum_conf)
@ -56,8 +57,10 @@ EOF
rpm -i --root=$(SANDBOX) `find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name "centos-release*rpm" | head -1` || \
echo "centos-release already installed"
rm -f $(SANDBOX)/etc/yum.repos.d/Cent*
echo 'Rebuilding RPM DB'
rpm --root=$(SANDBOX) --rebuilddb
yum -c $(SANDBOX)/etc/yum.conf --installroot=$(SANDBOX) -y --nogpgcheck install $(SANDBOX_PACKAGES)
echo 'Installing packages for Sandbox'
yum -c $(SANDBOX)/etc/yum.conf --installroot=$(SANDBOX) -y --exclude=ruby-2.1.1-1.1.x86_64 --nogpgcheck install $(SANDBOX_PACKAGES)
mount | grep -q $(SANDBOX)/proc || sudo mount --bind /proc $(SANDBOX)/proc
mount | grep -q $(SANDBOX)/dev || sudo mount --bind /dev $(SANDBOX)/dev
endef