From 35ec5c8aea6d45fdb71bffc04d6f70dae57bbc46 Mon Sep 17 00:00:00 2001 From: Philip Papadopoulos Date: Thu, 11 Feb 2016 13:42:59 -0800 Subject: [PATCH 01/12] initialize RABBITMQ_Server if not already defined Add conf file to 411.mk only if it wasn't already there --- nodes/rabbitmq-server.xml | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/nodes/rabbitmq-server.xml b/nodes/rabbitmq-server.xml index bff5ab7..3f6fff0 100644 --- a/nodes/rabbitmq-server.xml +++ b/nodes/rabbitmq-server.xml @@ -18,20 +18,30 @@ - RabbitMQServiceNode=$(/opt/rocks/bin/rocks list host attr | /bin/awk -F: '/RABBITMQ_Server /{print $1}') - echo $RabbitMQServiceNode > /opt/rocks/etc/rabbitmq.conf - chmod 400 /opt/rocks/etc/rabbitmq.conf +## Add the RABBITMQ_Server Attribute, if one doesn't exist +MQ_SERVER=&RABBITMQ_Server; +if [ "x$MQ_SERVER" = "x" ]; then + MQ_SERVER=&Kickstart_PublicHostname; + /opt/rocks/bin/rocks add attr RABBITMQ_Server $MQ_SERVER +fi + +## Create the rabbitmq.conf file on Frontend + + +Files411=/var/411/Files.mk +/bin/grep -q rabbitmq.conf $Files411 +if [ $? -ne 0 ]; then # adding rabbitmq to 411 so we push the password to the nodes - echo "FILES_NOCOMMENT += /opt/rocks/etc/rabbitmq.conf" >> /var/411/Files.mk + echo "FILES_NOCOMMENT += /opt/rocks/etc/rabbitmq.conf" >> $Files411 /usr/bin/make -C /var/411 411.mk +fi - /usr/bin/getent group rabbitmq >/dev/null 2>&1 || \ - /usr/sbin/groupadd -r rabbitmq - /usr/bin/getent passwd rabbitmq >/dev/null 2>&1 || \ - /usr/sbin/useradd -c "RabbitMQ service" \ - -d "/etc/slurm" -g rabbitmq -s /bin/false -r rabbitmq - +/usr/bin/getent group rabbitmq >/dev/null 2>&1 || \ + /usr/sbin/groupadd -r rabbitmq +/usr/bin/getent passwd rabbitmq >/dev/null 2>&1 || \ + /usr/sbin/useradd -c "RabbitMQ service" \ + -d "/etc/slurm" -g rabbitmq -s /bin/false -r rabbitmq From 6520177da8227fb2f25449d1791f34588e54e707 Mon Sep 17 00:00:00 2001 From: Philip Papadopoulos Date: Wed, 13 Sep 2017 16:47:25 -0700 Subject: [PATCH 02/12] make RPMS compatible with 7. Compile erlang directly. --- .rabbitmq-roll.metadata | 1 + src/erlang/Makefile | 152 ++++++++++++++++++ src/erlang/version.mk | 9 ++ src/foundation-python-backports/version.mk | 1 + src/foundation-python-paramiko/version.mk | 1 + src/foundation-python-pika/version.mk | 2 +- src/foundation-python-pycrypto/version.mk | 1 + .../version.mk | 1 + src/foundation-python-tornado/version.mk | 1 + src/rabbitmq/Makefile | 10 +- src/rabbitmq/pull.mk | 77 +++++++++ 11 files changed, 251 insertions(+), 5 deletions(-) create mode 100644 .rabbitmq-roll.metadata create mode 100644 src/erlang/Makefile create mode 100644 src/erlang/version.mk create mode 100644 src/rabbitmq/pull.mk diff --git a/.rabbitmq-roll.metadata b/.rabbitmq-roll.metadata new file mode 100644 index 0000000..ec44b80 --- /dev/null +++ b/.rabbitmq-roll.metadata @@ -0,0 +1 @@ +3689b217808087320d28feb11dc1dc888b351776 src/erlang/otp_src_18.2.tar.gz 0B0LD0shfkvCRUUMwbHVhZ2hKMkU diff --git a/src/erlang/Makefile b/src/erlang/Makefile new file mode 100644 index 0000000..e5d1fde --- /dev/null +++ b/src/erlang/Makefile @@ -0,0 +1,152 @@ +# --------------------------------------------------- -*- Makefile -*- -- +# $Id: Makefile,v 1.21 2012/11/27 00:49:01 phil Exp $ +# +# @Copyright@ +# +# Rocks(r) +# www.rocksclusters.org +# version 6.2 (SideWinder) +# +# Copyright (c) 2000 - 2014 The Regents of the University of California. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice unmodified and in its entirety, this list of conditions and the +# following disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# 3. All advertising and press materials, printed or electronic, mentioning +# features or use of this software must display the following acknowledgement: +# +# "This product includes software developed by the Rocks(r) +# Cluster Group at the San Diego Supercomputer Center at the +# University of California, San Diego and its contributors." +# +# 4. Except as permitted for the purposes of acknowledgment in paragraph 3, +# neither the name or logo of this software nor the names of its +# authors may be used to endorse or promote products derived from this +# software without specific prior written permission. The name of the +# software includes the following terms, and any derivatives thereof: +# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of +# the associated name, interested parties should contact Technology +# Transfer & Intellectual Property Services, University of California, +# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910, +# Ph: (858) 534-5815, FAX: (858) 534-7345, E-MAIL:invent@ucsd.edu +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# @Copyright@ +# +# $Log: Makefile,v $ +# Revision 1.21 2012/11/27 00:49:01 phil +# Copyright Storm for Emerald Boa +# +# Revision 1.20 2012/05/06 05:49:09 phil +# Copyright Storm for Mamba +# +# Revision 1.19 2011/07/23 02:31:05 phil +# Viper Copyright +# +# Revision 1.18 2010/11/28 00:42:10 anoop +# Solaris support for iperf-2.0.5 +# +# Revision 1.17 2010/09/14 17:10:00 bruno +# don't patch if the patch files don't exist for this version/os +# +# Revision 1.16 2010/09/07 23:53:20 bruno +# star power for gb +# +# Revision 1.15 2009/11/25 23:20:51 anoop +# Mods to support sunos patching for iperf +# +# Revision 1.14 2009/05/01 19:07:18 mjk +# chimi con queso +# +# Revision 1.13 2008/10/18 00:56:10 mjk +# copyright 5.1 +# +# Revision 1.12 2008/10/15 20:13:04 mjk +# - more changes to build outside of the tree +# - removed some old fds-only targets +# +# Revision 1.11 2008/05/21 17:46:55 anoop +# Merginig code from mercurial. +# This change makes the HPC roll more solaris friendly +# +# Revision 1.10 2008/03/06 23:41:53 mjk +# copyright storm on +# +# Revision 1.9 2008/02/28 17:32:55 bruno +# nuked the spec file for iperf +# +# Revision 1.8 2007/06/23 04:03:39 mjk +# mars hill copyright +# +# Revision 1.7 2006/09/11 22:48:52 mjk +# monkey face copyright +# +# Revision 1.6 2006/08/10 00:10:57 mjk +# 4.2 copyright +# +# Revision 1.5 2005/10/12 18:09:46 mjk +# final copyright for 4.1 +# +# Revision 1.4 2005/09/16 01:03:24 mjk +# updated copyright +# +# Revision 1.3 2005/05/24 21:22:49 mjk +# update copyright, release is not any closer +# +# Revision 1.2 2005/03/14 21:31:37 fds +# Fixed subtle name collision during build process. +# +# Revision 1.1 2005/02/17 01:32:02 bruno +# moved iperf source into the hpc roll +# +# Revision 1.3 2003/05/29 02:37:13 bruno +# added iperf 1.7 +# +# Revision 1.2 2002/10/07 04:34:46 mjk +# builds under new structure +# +# + +REDHAT.ROOT = $(CURDIR)/../../ + +-include $(ROCKSROOT)/etc/Rules.mk +include Rules.mk + +build: + $(TAR) xzvf $(TARNAME) + ( \ + cd $(DIRNAME); \ + ./configure --prefix=$(PKGROOT) --libdir=$(PKGROOT)/lib64; \ + $(MAKE) ; \ + ) +install:: + mkdir -p $(ROOT)/$(PKGROOT) + ( \ + cd $(DIRNAME); \ + $(MAKE) DESTDIR=$(ROOT) install ; \ + ) + + +clean:: + rm -rf $(DIRNAME) diff --git a/src/erlang/version.mk b/src/erlang/version.mk new file mode 100644 index 0000000..fc48886 --- /dev/null +++ b/src/erlang/version.mk @@ -0,0 +1,9 @@ +NAME = erlang +VERSION = 18.2 +RELEASE = 1 +PKGROOT = /usr +DIRNAME = otp_src_$(VERSION) +TARNAME = $(DIRNAME).tar.gz +RPM.FILES = \ +$(PKGROOT)/bin/*\n\ +$(PKGROOT)/lib64/* diff --git a/src/foundation-python-backports/version.mk b/src/foundation-python-backports/version.mk index af8e2cb..efd26d2 100644 --- a/src/foundation-python-backports/version.mk +++ b/src/foundation-python-backports/version.mk @@ -13,3 +13,4 @@ SOURCE_PKG = $(SOURCE_NAME)-$(SOURCE_VERSION).$(SOURCE_SUFFIX) SOURCE_DIR = $(SOURCE_PKG:%.$(SOURCE_SUFFIX)=%) TAR_GZ_PKGS = $(SOURCE_PKG) +RPM.FILES = $(PY.ROCKS)/* diff --git a/src/foundation-python-paramiko/version.mk b/src/foundation-python-paramiko/version.mk index 51a069c..243ea1a 100644 --- a/src/foundation-python-paramiko/version.mk +++ b/src/foundation-python-paramiko/version.mk @@ -13,3 +13,4 @@ SOURCE_PKG = $(SOURCE_NAME)-$(SOURCE_VERSION).$(SOURCE_SUFFIX) SOURCE_DIR = $(SOURCE_PKG:%.$(SOURCE_SUFFIX)=%) TAR_GZ_PKGS = $(SOURCE_PKG) +RPM.FILES = $(PY.ROCKS)/* diff --git a/src/foundation-python-pika/version.mk b/src/foundation-python-pika/version.mk index cf4397b..ff5e501 100644 --- a/src/foundation-python-pika/version.mk +++ b/src/foundation-python-pika/version.mk @@ -13,4 +13,4 @@ SOURCE_PKG = $(SOURCE_NAME)-$(SOURCE_VERSION).$(SOURCE_SUFFIX) SOURCE_DIR = $(SOURCE_PKG:%.$(SOURCE_SUFFIX)=%) TAR_GZ_PKGS = $(SOURCE_PKG) - +RPM.FILES = $(PY.ROCKS)/* diff --git a/src/foundation-python-pycrypto/version.mk b/src/foundation-python-pycrypto/version.mk index 3b6e2eb..ca3100a 100644 --- a/src/foundation-python-pycrypto/version.mk +++ b/src/foundation-python-pycrypto/version.mk @@ -13,3 +13,4 @@ SOURCE_PKG = $(SOURCE_NAME)-$(SOURCE_VERSION).$(SOURCE_SUFFIX) SOURCE_DIR = $(SOURCE_PKG:%.$(SOURCE_SUFFIX)=%) TAR_GZ_PKGS = $(SOURCE_PKG) +RPM.FILES = $(PY.ROCKS)/* diff --git a/src/foundation-python-rabbitmqclient/version.mk b/src/foundation-python-rabbitmqclient/version.mk index edfcc12..09dea90 100644 --- a/src/foundation-python-rabbitmqclient/version.mk +++ b/src/foundation-python-rabbitmqclient/version.mk @@ -2,3 +2,4 @@ NAME = foundation-python-rabbitmqclient RELEASE = 2 RPM.ARCH = noarch +RPM.FILES = $(PY.ROCKS)/* diff --git a/src/foundation-python-tornado/version.mk b/src/foundation-python-tornado/version.mk index 4ee0768..1e3e07c 100644 --- a/src/foundation-python-tornado/version.mk +++ b/src/foundation-python-tornado/version.mk @@ -13,3 +13,4 @@ SOURCE_PKG = $(SOURCE_NAME)-$(SOURCE_VERSION).$(SOURCE_SUFFIX) SOURCE_DIR = $(SOURCE_PKG:%.$(SOURCE_SUFFIX)=%) TAR_GZ_PKGS = $(SOURCE_PKG) +RPM.FILES = $(PY.ROCKS)/* diff --git a/src/rabbitmq/Makefile b/src/rabbitmq/Makefile index bfa7cc5..7decb33 100644 --- a/src/rabbitmq/Makefile +++ b/src/rabbitmq/Makefile @@ -61,16 +61,18 @@ REDHAT.ROOT = $(CURDIR)/../../ -include $(ROCKSROOT)/etc/Rules.mk include Rules.mk -include $(SDSCDEVEL)/Pull.mk -include $(SDSCDEVEL)/Rules.mk +-include $(SDSCDEVEL)/Pull.mk +-include $(SDSCDEVEL)/Rules.mk +include pull.mk build: $(SRC_DIRS) ( \ cd $(SOURCE_DIR); \ mkdir -p $(REDHAT.ROOT)/RPMS/noarch/ ;\ mkdir -p $(REDHAT.ROOT)/RPMS/x86_64/ ;\ - cp -av *.noarch.rpm $(REDHAT.ROOT)/RPMS/noarch/ ;\ - cp -av *.x86_64.rpm $(REDHAT.ROOT)/RPMS/x86_64/ ;\ + /bin/rm erlang*rpm ; \ + find . -name '*.noarch.rpm' -exec cp -av {} $(REDHAT.ROOT)/RPMS/noarch/ \; ;\ + find . -name '*.x86_64.rpm' -exec cp -av {} $(REDHAT.ROOT)/RPMS/x86_64/ \; ;\ ) @echo "::: Package $(NAME) build complete :::" diff --git a/src/rabbitmq/pull.mk b/src/rabbitmq/pull.mk new file mode 100644 index 0000000..9436b24 --- /dev/null +++ b/src/rabbitmq/pull.mk @@ -0,0 +1,77 @@ +ifndef __PULL_MK +__PULL_MK = yes + +DL.CMD = $(shell which curl) +DL.OPTS = -f -LO +DL.SERVER = http://forge.sdsc.edu +DL.PATH = triton/$(ROLLNAME)/src/$(SRC_SUBDIR) +GREP.CMD = $(shell which grep) +STAT.CMD = $(shell which stat) +TAR.CMD = $(shell which tar) +TGZ.OPTS = -xzf +TBZ2.OPTS = -xjf +UNZIP.CMD = $(shell which unzip) +UNZIP.OPTS = -q +VERIFY.CMD = $(shell which git) +VERIFY.OPTS = hash-object -t blob +VERIFY.HASHES = binary_hashes + +# ALL packages are part of SRC_PKGS +SRC_PKGS = $(TAR_GZ_PKGS) $(TAR_BZ2_PKGS) $(TGZ_PKGS) $(ZIP_PKGS) + +# Download the required packages, verify size and hash... +.PHONY : download $(SRC_PKGS) +download : $(SRC_PKGS) +$(SRC_PKGS): + @echo "::: Downloading $(DL.SERVER)/$(DL.PATH)/$@ :::" + @ if [ -f $@ ]; then \ + echo "::: $@ exists. Skipping... :::" ; \ + else \ + $(DL.CMD) $(DL.OPTS) $(DL.SERVER)/$(DL.PATH)/$@ ; \ + echo "::: Verifying size of $@ :::" ; \ + $(GREP.CMD) `$(STAT.CMD) --printf="%s" $@` $(VERIFY.HASHES) || exit 2 ; \ + echo "::: Verifying hash of $@ :::" ; \ + $(GREP.CMD) `$(VERIFY.CMD) $(VERIFY.OPTS) $@ ` $(VERIFY.HASHES) || exit 2 ; \ + echo "" ; \ + fi + +# For cleanup convert that package archive names into directory names. +# This can likely be 'generalized' with a variable I don't know yet... +TAR_GZ_DIRS = $(TAR_GZ_PKGS:%.tar.gz=%) +TAR_BZ2_DIRS = $(TAR_BZ2_PKGS:%.tar.bz2=%) +TGZ_DIRS = $(TGZ_PKGS:%.tgz=%) +ZIP_DIRS = $(ZIP_PKGS:%.zip=%) + +# Unbundle the package archives to create SRC_DIRS. +# Can this be done with pattern matching/variables/filters? +$(TAR_GZ_DIRS): $(TAR_GZ_PKGS) + @echo "::: Unbundling $@.tar.gz :::" + @$(TAR.CMD) $(TGZ.OPTS) $@.tar.gz + @echo "" + +$(TAR_BZ2_DIRS): $(TAR_BZ2_PKGS) + @echo "::: Unbundling $@.tar.bz2 :::" + @$(TAR.CMD) $(TBZ2.OPTS) $@.tar.bz2 + @echo "" + +$(TGZ_DIRS): $(TGZ_PKGS) + @echo "::: Unbundling $@.tgz :::" + @$(TAR.CMD) $(TGZ.OPTS) $@.tgz + @echo "" + +$(ZIP_DIRS): $(ZIP_PKGS) + @echo "::: Unbundling $@.zip :::" + @$(UNZIP.CMD) $(UNZIP.OPTS) $@.zip + @echo "" + +# SRC_DIRS is the target that build will depend on +SRC_DIRS = $(TAR_GZ_DIRS) $(TAR_BZ2_DIRS) $(TGZ_DIRS) $(ZIP_DIRS) + +# Clean up after ourselves... +clean:: + -rm -rf $(SRC_DIRS) + +distclean:: clean + -rm -rf $(SRC_PKGS) + +endif # __PULL_MK From 6873498327fb9693b41115c248b3d72b12fe1177 Mon Sep 17 00:00:00 2001 From: Philip Papadopulos Date: Wed, 4 Oct 2017 16:06:20 -0400 Subject: [PATCH 03/12] Adjustments for working with 7 --- nodes/rabbitmq-client.xml | 2 +- nodes/rabbitmq-common.xml | 1 + nodes/rabbitmq-server.xml | 2 +- nodes/rabbitmq-service.xml | 2 -- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nodes/rabbitmq-client.xml b/nodes/rabbitmq-client.xml index 806950d..c3fa652 100644 --- a/nodes/rabbitmq-client.xml +++ b/nodes/rabbitmq-client.xml @@ -17,7 +17,7 @@ $Log$ - cryptoclient + diff --git a/nodes/rabbitmq-common.xml b/nodes/rabbitmq-common.xml index 728fb65..2f0662b 100644 --- a/nodes/rabbitmq-common.xml +++ b/nodes/rabbitmq-common.xml @@ -23,4 +23,5 @@ foundation-python-backports.ssl_match_hostname foundation-python-paramiko foundation-python-pycrypto + erlang diff --git a/nodes/rabbitmq-server.xml b/nodes/rabbitmq-server.xml index 7fb9c99..bc739f7 100644 --- a/nodes/rabbitmq-server.xml +++ b/nodes/rabbitmq-server.xml @@ -17,7 +17,7 @@ $Log$ - cryptoserver + diff --git a/nodes/rabbitmq-service.xml b/nodes/rabbitmq-service.xml index 0278953..8c349ad 100644 --- a/nodes/rabbitmq-service.xml +++ b/nodes/rabbitmq-service.xml @@ -17,8 +17,6 @@ $Log$ - rabbitmq - erlang rabbitmq-server From 6f5bb66ffed298d54300593df71155a941534cdf Mon Sep 17 00:00:00 2001 From: Philip Papadopulos Date: Wed, 11 Oct 2017 23:35:58 -0400 Subject: [PATCH 04/12] Install the service if hostname is identical to RABBITMQ_Server --- graphs/default/rabbitmq.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphs/default/rabbitmq.xml b/graphs/default/rabbitmq.xml index 4fc5a75..ec03b7c 100644 --- a/graphs/default/rabbitmq.xml +++ b/graphs/default/rabbitmq.xml @@ -19,7 +19,7 @@ - + rabbitmq-service From 105dc8febbcbf486ec1ff7055aacb00b63eb27d7 Mon Sep 17 00:00:00 2001 From: Philip Papadopulos Date: Fri, 13 Oct 2017 13:17:07 -0400 Subject: [PATCH 05/12] Different method of getting rocks version --- version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sh b/version.sh index a8d62c2..d210ab5 100755 --- a/version.sh +++ b/version.sh @@ -1,6 +1,6 @@ #!/bin/sh -ROCKS_VERSION=`cat /etc/rocks-release 2>/dev/null | awk '{print $3}'` +ROCKS_VERSION=$(/opt/rocks/bin/python -c 'import rocks; print rocks.version') DESC_CMD="git describe --match 'v${ROCKS_VERSION}' 2>/dev/null | sed \"s/v\([0-9\.]*\)-*\([0-9]*\)-*\([0-9a-z]*\)/\1 \2 \3/\"" DESC=`eval ${DESC_CMD}` #DESC=`git describe --match 'v*' 2>/dev/null | sed "s/v\([0-9\.]*\)-*\([0-9]*\)-*\([0-9a-z]*\)/\1 \2 \3/"` From f25dcaaa533b9cd3133c42b5a447cb0ae88009b5 Mon Sep 17 00:00:00 2001 From: Philip Papadopulos Date: Sat, 28 Oct 2017 01:30:17 -0400 Subject: [PATCH 06/12] Create an attribute in the installer --- include/json/rabbitmq.json | 14 ++++++++++++++ nodes/rabbitmq-service.xml | 13 +++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 include/json/rabbitmq.json diff --git a/include/json/rabbitmq.json b/include/json/rabbitmq.json new file mode 100644 index 0000000..2e63c42 --- /dev/null +++ b/include/json/rabbitmq.json @@ -0,0 +1,14 @@ +[ + { + "required": true, + "value": "", + "varname": "RABBITMQ_Server", + "infoHelp": "Short name of node that runs the RabbitMQ Server. This is often the frontend", + "param": "RabbitMQ Server Node", + "validate": null, + "derived": false, + "color": "light green", + "colorlabel": "light green", + "display": true + } +] diff --git a/nodes/rabbitmq-service.xml b/nodes/rabbitmq-service.xml index 8c349ad..a53cc89 100644 --- a/nodes/rabbitmq-service.xml +++ b/nodes/rabbitmq-service.xml @@ -22,8 +22,17 @@ -RABBITMQ_UID=/usr/bin/getent passwd rabbitmq 2>&1 > /dev/null && /usr/bin/id -u rabbitmq -RABBITMQ_GID=/usr/bin/getent group rabbitmq 2>&1 > /dev/null && /usr/bin/id -g rabbitmq +RABBITMQ_UID=/usr/bin/getent passwd rabbitmq 2>&1 > /dev/null && /usr/bin/id -u rabbitmq +RABBITMQ_GID=/usr/bin/getent group rabbitmq 2>&1 > /dev/null && /usr/bin/id -g rabbitmq + +### If the above evals are empty, then rabbitmq wasn't a user when +### kickstart was created. Read again from the environment +if [ "x$RABBITMQ_UID" == "x" ]; then + RABBITMQ_UID=$(/usr/bin/getent passwd rabbitmq 2>&1 > /dev/null && /usr/bin/id -u rabbitmq) +fi +if [ "x$RABBITMQ_GID" == "x" ]; then + RABBITMQ_GID=$(/usr/bin/getent group rabbitmq 2>&1 > /dev/null && /usr/bin/id -g rabbitmq) +fi # rabbitmq UID|GID were created during install of the rabbitmq RPM # we must set these to the same value as on the frontend so we don't From 03318d96dc738ee5690baac112d94b832bcdab14 Mon Sep 17 00:00:00 2001 From: Philip Papadopulos Date: Wed, 1 Nov 2017 13:26:22 -0400 Subject: [PATCH 07/12] Set an initializer (the frontend) to where the rabbitmq server is located --- include/json/rabbitmq.json | 1 + 1 file changed, 1 insertion(+) diff --git a/include/json/rabbitmq.json b/include/json/rabbitmq.json index 2e63c42..aa9d512 100644 --- a/include/json/rabbitmq.json +++ b/include/json/rabbitmq.json @@ -2,6 +2,7 @@ { "required": true, "value": "", + "initialize": "Kickstart_PublicHostname", "varname": "RABBITMQ_Server", "infoHelp": "Short name of node that runs the RabbitMQ Server. This is often the frontend", "param": "RabbitMQ Server Node", From 19de251a7baa7e95282a06ac4bdd9bdfecb5db59 Mon Sep 17 00:00:00 2001 From: Philip Papadopoulos Date: Tue, 28 Nov 2017 19:09:27 -0800 Subject: [PATCH 08/12] Copyright Storm for 7.0 --- Makefile | 5 +- graphs/default/rabbitmq.xml | 4 +- nodes/rabbitmq-client.xml | 4 +- nodes/rabbitmq-common.xml | 4 +- nodes/rabbitmq-server.xml | 4 +- nodes/rabbitmq-service.xml | 4 +- src/Makefile | 5 +- src/erlang/Makefile | 5 +- src/foundation-python-backports/Makefile | 6 +-- src/foundation-python-paramiko/Makefile | 6 +-- src/foundation-python-pika/Makefile | 6 +-- src/foundation-python-pycrypto/Makefile | 6 +-- src/foundation-python-rabbitmqclient/Makefile | 40 +++++++-------- .../rabbitmqclient/__init__.py | 50 +++++++++---------- src/foundation-python-tornado/Makefile | 6 +-- src/rabbitmq/Makefile | 5 +- 16 files changed, 82 insertions(+), 78 deletions(-) diff --git a/Makefile b/Makefile index 40c14e3..52c05a7 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,10 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.1.1 (Sand Boa) +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) # -# Copyright (c) 2000 - 2014 The Regents of the University of California. +# Copyright (c) 2000 - 2017 The Regents of the University of California. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/graphs/default/rabbitmq.xml b/graphs/default/rabbitmq.xml index ec03b7c..428736f 100644 --- a/graphs/default/rabbitmq.xml +++ b/graphs/default/rabbitmq.xml @@ -9,8 +9,8 @@ - Copyright (c) 2000 - 2014 The Regents of the University of California. - All rights reserved. Rocks(r) v6.1.1 www.rocksclusters.org + Copyright (c) 2000 - 2017 The Regents of the University of California. + All rights reserved. Rocks(r) v6.2/v7.0 www.rocksclusters.org diff --git a/nodes/rabbitmq-client.xml b/nodes/rabbitmq-client.xml index c3fa652..e4b829f 100644 --- a/nodes/rabbitmq-client.xml +++ b/nodes/rabbitmq-client.xml @@ -8,8 +8,8 @@ - Copyright (c) 2000 - 2014 The Regents of the University of California. - All rights reserved. Rocks(r) v6.1.1 www.rocksclusters.org + Copyright (c) 2000 - 2017 The Regents of the University of California. + All rights reserved. Rocks(r) v6.2/v7.0 www.rocksclusters.org diff --git a/nodes/rabbitmq-common.xml b/nodes/rabbitmq-common.xml index 2f0662b..9c87cd5 100644 --- a/nodes/rabbitmq-common.xml +++ b/nodes/rabbitmq-common.xml @@ -8,8 +8,8 @@ - Copyright (c) 2000 - 2014 The Regents of the University of California. - All rights reserved. Rocks(r) v6.1.1 www.rocksclusters.org + Copyright (c) 2000 - 2017 The Regents of the University of California. + All rights reserved. Rocks(r) v6.2/v7.0 www.rocksclusters.org diff --git a/nodes/rabbitmq-server.xml b/nodes/rabbitmq-server.xml index bc739f7..6ac1b95 100644 --- a/nodes/rabbitmq-server.xml +++ b/nodes/rabbitmq-server.xml @@ -8,8 +8,8 @@ - Copyright (c) 2000 - 2014 The Regents of the University of California. - All rights reserved. Rocks(r) v6.1.1 www.rocksclusters.org + Copyright (c) 2000 - 2017 The Regents of the University of California. + All rights reserved. Rocks(r) v6.2/v7.0 www.rocksclusters.org diff --git a/nodes/rabbitmq-service.xml b/nodes/rabbitmq-service.xml index a53cc89..395ca29 100644 --- a/nodes/rabbitmq-service.xml +++ b/nodes/rabbitmq-service.xml @@ -8,8 +8,8 @@ - Copyright (c) 2000 - 2014 The Regents of the University of California. - All rights reserved. Rocks(r) v6.1.1 www.rocksclusters.org + Copyright (c) 2000 - 2017 The Regents of the University of California. + All rights reserved. Rocks(r) v6.2/v7.0 www.rocksclusters.org diff --git a/src/Makefile b/src/Makefile index e2a6b8a..1b5c64d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,9 +5,10 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.1.1 (Sand Boa) +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) # -# Copyright (c) 2000 - 2014 The Regents of the University of California. +# Copyright (c) 2000 - 2017 The Regents of the University of California. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/erlang/Makefile b/src/erlang/Makefile index e5d1fde..4e2f555 100644 --- a/src/erlang/Makefile +++ b/src/erlang/Makefile @@ -5,9 +5,10 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWinder) +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) # -# Copyright (c) 2000 - 2014 The Regents of the University of California. +# Copyright (c) 2000 - 2017 The Regents of the University of California. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/foundation-python-backports/Makefile b/src/foundation-python-backports/Makefile index 3b2f17d..fa3acac 100644 --- a/src/foundation-python-backports/Makefile +++ b/src/foundation-python-backports/Makefile @@ -4,10 +4,10 @@ # # Rocks(r) # www.rocksclusters.org -# version 5.6 (Emerald Boa) -# version 6.1 (Emerald Boa) +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) # -# Copyright (c) 2000 - 2013 The Regents of the University of California. +# Copyright (c) 2000 - 2017 The Regents of the University of California. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/foundation-python-paramiko/Makefile b/src/foundation-python-paramiko/Makefile index 3b2f17d..fa3acac 100644 --- a/src/foundation-python-paramiko/Makefile +++ b/src/foundation-python-paramiko/Makefile @@ -4,10 +4,10 @@ # # Rocks(r) # www.rocksclusters.org -# version 5.6 (Emerald Boa) -# version 6.1 (Emerald Boa) +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) # -# Copyright (c) 2000 - 2013 The Regents of the University of California. +# Copyright (c) 2000 - 2017 The Regents of the University of California. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/foundation-python-pika/Makefile b/src/foundation-python-pika/Makefile index 1a034eb..48aa18b 100644 --- a/src/foundation-python-pika/Makefile +++ b/src/foundation-python-pika/Makefile @@ -4,10 +4,10 @@ # # Rocks(r) # www.rocksclusters.org -# version 5.6 (Emerald Boa) -# version 6.1 (Emerald Boa) +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) # -# Copyright (c) 2000 - 2013 The Regents of the University of California. +# Copyright (c) 2000 - 2017 The Regents of the University of California. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/foundation-python-pycrypto/Makefile b/src/foundation-python-pycrypto/Makefile index 3b2f17d..fa3acac 100644 --- a/src/foundation-python-pycrypto/Makefile +++ b/src/foundation-python-pycrypto/Makefile @@ -4,10 +4,10 @@ # # Rocks(r) # www.rocksclusters.org -# version 5.6 (Emerald Boa) -# version 6.1 (Emerald Boa) +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) # -# Copyright (c) 2000 - 2013 The Regents of the University of California. +# Copyright (c) 2000 - 2017 The Regents of the University of California. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/foundation-python-rabbitmqclient/Makefile b/src/foundation-python-rabbitmqclient/Makefile index f09b225..da28819 100644 --- a/src/foundation-python-rabbitmqclient/Makefile +++ b/src/foundation-python-rabbitmqclient/Makefile @@ -1,44 +1,44 @@ # # @Copyright@ -# +# # Rocks(r) # www.rocksclusters.org -# version 5.6 (Emerald Boa) -# version 6.1 (Emerald Boa) -# -# Copyright (c) 2000 - 2013 The Regents of the University of California. -# All rights reserved. -# +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) +# +# Copyright (c) 2000 - 2017 The Regents of the University of California. +# All rights reserved. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: -# +# # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. -# +# # 2. Redistributions in binary form must reproduce the above copyright # notice unmodified and in its entirety, this list of conditions and the -# following disclaimer in the documentation and/or other materials provided +# following disclaimer in the documentation and/or other materials provided # with the distribution. -# +# # 3. All advertising and press materials, printed or electronic, mentioning -# features or use of this software must display the following acknowledgement: -# +# features or use of this software must display the following acknowledgement: +# # "This product includes software developed by the Rocks(r) # Cluster Group at the San Diego Supercomputer Center at the # University of California, San Diego and its contributors." -# +# # 4. Except as permitted for the purposes of acknowledgment in paragraph 3, # neither the name or logo of this software nor the names of its # authors may be used to endorse or promote products derived from this # software without specific prior written permission. The name of the # software includes the following terms, and any derivatives thereof: -# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of -# the associated name, interested parties should contact Technology -# Transfer & Intellectual Property Services, University of California, -# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910, +# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of +# the associated name, interested parties should contact Technology +# Transfer & Intellectual Property Services, University of California, +# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910, # Ph: (858) 534-5815, FAX: (858) 534-7345, E-MAIL:invent@ucsd.edu -# +# # THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -50,7 +50,7 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +# # @Copyright@ # diff --git a/src/foundation-python-rabbitmqclient/rabbitmqclient/__init__.py b/src/foundation-python-rabbitmqclient/rabbitmqclient/__init__.py index 0447a27..22814f7 100644 --- a/src/foundation-python-rabbitmqclient/rabbitmqclient/__init__.py +++ b/src/foundation-python-rabbitmqclient/rabbitmqclient/__init__.py @@ -2,45 +2,45 @@ # -*- coding: utf-8 -*- # @Copyright@ -# -# Rocks(r) -# www.rocksclusters.org -# version 5.6 (Emerald Boa) -# version 6.1 (Emerald Boa) -# -# Copyright (c) 2000 - 2013 The Regents of the University of California. -# All rights reserved. -# +# +# Rocks(r) +# www.rocksclusters.org +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) +# +# Copyright (c) 2000 - 2017 The Regents of the University of California. +# All rights reserved. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: -# +# # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. -# +# # 2. Redistributions in binary form must reproduce the above copyright # notice unmodified and in its entirety, this list of conditions and the -# following disclaimer in the documentation and/or other materials provided +# following disclaimer in the documentation and/or other materials provided # with the distribution. -# +# # 3. All advertising and press materials, printed or electronic, mentioning -# features or use of this software must display the following acknowledgement: -# -# "This product includes software developed by the Rocks(r) -# Cluster Group at the San Diego Supercomputer Center at the -# University of California, San Diego and its contributors." -# +# features or use of this software must display the following acknowledgement: +# +# "This product includes software developed by the Rocks(r) +# Cluster Group at the San Diego Supercomputer Center at the +# University of California, San Diego and its contributors." +# # 4. Except as permitted for the purposes of acknowledgment in paragraph 3, # neither the name or logo of this software nor the names of its # authors may be used to endorse or promote products derived from this # software without specific prior written permission. The name of the # software includes the following terms, and any derivatives thereof: -# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of -# the associated name, interested parties should contact Technology -# Transfer & Intellectual Property Services, University of California, -# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910, +# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of +# the associated name, interested parties should contact Technology +# Transfer & Intellectual Property Services, University of California, +# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910, # Ph: (858) 534-5815, FAX: (858) 534-7345, E-MAIL:invent@ucsd.edu -# +# # THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -52,7 +52,7 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +# # @Copyright@ # diff --git a/src/foundation-python-tornado/Makefile b/src/foundation-python-tornado/Makefile index df25262..56e5775 100644 --- a/src/foundation-python-tornado/Makefile +++ b/src/foundation-python-tornado/Makefile @@ -3,10 +3,10 @@ # # Rocks(r) # www.rocksclusters.org -# version 5.6 (Emerald Boa) -# version 6.1 (Emerald Boa) +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) # -# Copyright (c) 2000 - 2013 The Regents of the University of California. +# Copyright (c) 2000 - 2017 The Regents of the University of California. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/src/rabbitmq/Makefile b/src/rabbitmq/Makefile index 7decb33..01f647e 100644 --- a/src/rabbitmq/Makefile +++ b/src/rabbitmq/Makefile @@ -5,9 +5,10 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.1.1 (Sand Boa) +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) # -# Copyright (c) 2000 - 2014 The Regents of the University of California. +# Copyright (c) 2000 - 2017 The Regents of the University of California. # All rights reserved. # # Redistribution and use in source and binary forms, with or without From 85438f14f97195a9def8f0db09e4ee30d3502ca8 Mon Sep 17 00:00:00 2001 From: Philip Papadopoulos Date: Thu, 30 Nov 2017 17:42:48 -0800 Subject: [PATCH 09/12] Foundation packages and bootstrap --- .rabbitmq-roll.metadata | 3 + bootstrap.sh | 63 ++++++++++++++++ src/foundation-python-daemon/Makefile | 92 +++++++++++++++++++++++ src/foundation-python-daemon/version.mk | 5 ++ src/foundation-python-lockfile/Makefile | 92 +++++++++++++++++++++++ src/foundation-python-lockfile/version.mk | 6 ++ src/foundation-python-pbr/Makefile | 92 +++++++++++++++++++++++ src/foundation-python-pbr/version.mk | 5 ++ 8 files changed, 358 insertions(+) create mode 100755 bootstrap.sh create mode 100644 src/foundation-python-daemon/Makefile create mode 100644 src/foundation-python-daemon/version.mk create mode 100644 src/foundation-python-lockfile/Makefile create mode 100644 src/foundation-python-lockfile/version.mk create mode 100644 src/foundation-python-pbr/Makefile create mode 100644 src/foundation-python-pbr/version.mk diff --git a/.rabbitmq-roll.metadata b/.rabbitmq-roll.metadata index ec44b80..07f5669 100644 --- a/.rabbitmq-roll.metadata +++ b/.rabbitmq-roll.metadata @@ -1 +1,4 @@ 3689b217808087320d28feb11dc1dc888b351776 src/erlang/otp_src_18.2.tar.gz 0B0LD0shfkvCRUUMwbHVhZ2hKMkU +c2ac46e48585e5f8f8d57ccc55ca83faa8b53b86 src/foundation-python-lockfile/lockfile-0.12.2.tar.gz 1aO_pv0dVmvocYrV45vwYQU0IVxPx2Eld +30e236b4d5375e04b6f01a51870c80dbdae7d723 src/foundation-python-pbr/pbr-3.1.1.tar.gz 1ZEWu7dnz52GFzP4IudFfhFVWAHAB21Xu +e333e9031424611b8974d2b2d2804dd26c4fae8e src/foundation-python-daemon/python-daemon-2.1.2.tar.gz 1uvpdY_dQp_mBRWcJ7EcLFd9fq77voU2i diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 0000000..3ce4ea6 --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# +# This file should remain OS independent +# +# $Id: bootstrap.sh,v 1.6 2012/11/27 00:49:04 phil Exp $ +# +# @Copyright@ +# +# Rocks(r) +# www.rocksclusters.org +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) +# +# Copyright (c) 2000 - 2017 The Regents of the University of California. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice unmodified and in its entirety, this list of conditions and the +# following disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# 3. All advertising and press materials, printed or electronic, mentioning +# features or use of this software must display the following acknowledgement: +# +# "This product includes software developed by the Rocks(r) +# Cluster Group at the San Diego Supercomputer Center at the +# University of California, San Diego and its contributors." +# +# 4. Except as permitted for the purposes of acknowledgment in paragraph 3, +# neither the name or logo of this software nor the names of its +# authors may be used to endorse or promote products derived from this +# software without specific prior written permission. The name of the +# software includes the following terms, and any derivatives thereof: +# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of +# the associated name, interested parties should contact Technology +# Transfer & Intellectual Property Services, University of California, +# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910, +# Ph: (858) 534-5815, FAX: (858) 534-7345, E-MAIL:invent@ucsd.edu +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# @Copyright@ +# +. $ROLLSROOT/etc/bootstrap-functions.sh || exit 1 + +compile_and_install foundation-python-pbr diff --git a/src/foundation-python-daemon/Makefile b/src/foundation-python-daemon/Makefile new file mode 100644 index 0000000..9007f44 --- /dev/null +++ b/src/foundation-python-daemon/Makefile @@ -0,0 +1,92 @@ +# --------------------------------------------------- -*- Makefile -*- -- +# $Id: Makefile,v 1.3 2012/11/27 00:48:37 phil Exp $ +# +# @Copyright@ +# +# Rocks(r) +# www.rocksclusters.org +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) +# +# Copyright (c) 2000 - 2017 The Regents of the University of California. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice unmodified and in its entirety, this list of conditions and the +# following disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# 3. All advertising and press materials, printed or electronic, mentioning +# features or use of this software must display the following acknowledgement: +# +# "This product includes software developed by the Rocks(r) +# Cluster Group at the San Diego Supercomputer Center at the +# University of California, San Diego and its contributors." +# +# 4. Except as permitted for the purposes of acknowledgment in paragraph 3, +# neither the name or logo of this software nor the names of its +# authors may be used to endorse or promote products derived from this +# software without specific prior written permission. The name of the +# software includes the following terms, and any derivatives thereof: +# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of +# the associated name, interested parties should contact Technology +# Transfer & Intellectual Property Services, University of California, +# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910, +# Ph: (858) 534-5815, FAX: (858) 534-7345, E-MAIL:invent@ucsd.edu +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# @Copyright@ +# +# $Log: Makefile,v $ +# Revision 1.3 2012/11/27 00:48:37 phil +# Copyright Storm for Emerald Boa +# +# Revision 1.2 2012/05/06 05:48:43 phil +# Copyright Storm for Mamba +# +# Revision 1.1 2012/02/01 20:42:59 phil +# Setuptools needed for MYSQL-python build on Rocks v. 6 +# +# + +PKGROOT = /opt/rocks +REDHAT.ROOT = $(CURDIR)/../../ +-include $(ROCKSROOT)/etc/Rules.mk +include Rules.mk + + +build: + + +$(PACKAGES): + gunzip -c $@.tar.gz | $(TAR) -xf - + mkdir -p $(ROOT)/$(PKGROOT) + ( \ + cd $@; \ + $(PY.PATH) setup.py build; \ + $(PY.PATH) setup.py install --root=$(ROOT); \ + ) + +install:: $(PACKAGES) + + +clean:: + rm -rf V diff --git a/src/foundation-python-daemon/version.mk b/src/foundation-python-daemon/version.mk new file mode 100644 index 0000000..7d65c9e --- /dev/null +++ b/src/foundation-python-daemon/version.mk @@ -0,0 +1,5 @@ +NAME = foundation-python-daemon +RELEASE = 0 +VERSION = 2.1.2 +PACKAGES = python-daemon-2.1.2 +RPM.FILES = "$(PY.ROCKS)/*" diff --git a/src/foundation-python-lockfile/Makefile b/src/foundation-python-lockfile/Makefile new file mode 100644 index 0000000..9007f44 --- /dev/null +++ b/src/foundation-python-lockfile/Makefile @@ -0,0 +1,92 @@ +# --------------------------------------------------- -*- Makefile -*- -- +# $Id: Makefile,v 1.3 2012/11/27 00:48:37 phil Exp $ +# +# @Copyright@ +# +# Rocks(r) +# www.rocksclusters.org +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) +# +# Copyright (c) 2000 - 2017 The Regents of the University of California. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice unmodified and in its entirety, this list of conditions and the +# following disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# 3. All advertising and press materials, printed or electronic, mentioning +# features or use of this software must display the following acknowledgement: +# +# "This product includes software developed by the Rocks(r) +# Cluster Group at the San Diego Supercomputer Center at the +# University of California, San Diego and its contributors." +# +# 4. Except as permitted for the purposes of acknowledgment in paragraph 3, +# neither the name or logo of this software nor the names of its +# authors may be used to endorse or promote products derived from this +# software without specific prior written permission. The name of the +# software includes the following terms, and any derivatives thereof: +# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of +# the associated name, interested parties should contact Technology +# Transfer & Intellectual Property Services, University of California, +# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910, +# Ph: (858) 534-5815, FAX: (858) 534-7345, E-MAIL:invent@ucsd.edu +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# @Copyright@ +# +# $Log: Makefile,v $ +# Revision 1.3 2012/11/27 00:48:37 phil +# Copyright Storm for Emerald Boa +# +# Revision 1.2 2012/05/06 05:48:43 phil +# Copyright Storm for Mamba +# +# Revision 1.1 2012/02/01 20:42:59 phil +# Setuptools needed for MYSQL-python build on Rocks v. 6 +# +# + +PKGROOT = /opt/rocks +REDHAT.ROOT = $(CURDIR)/../../ +-include $(ROCKSROOT)/etc/Rules.mk +include Rules.mk + + +build: + + +$(PACKAGES): + gunzip -c $@.tar.gz | $(TAR) -xf - + mkdir -p $(ROOT)/$(PKGROOT) + ( \ + cd $@; \ + $(PY.PATH) setup.py build; \ + $(PY.PATH) setup.py install --root=$(ROOT); \ + ) + +install:: $(PACKAGES) + + +clean:: + rm -rf V diff --git a/src/foundation-python-lockfile/version.mk b/src/foundation-python-lockfile/version.mk new file mode 100644 index 0000000..ed4f308 --- /dev/null +++ b/src/foundation-python-lockfile/version.mk @@ -0,0 +1,6 @@ +NAME = foundation-python-lockfile +RELEASE = 0 +VERSION = 0.12.2 +PACKAGES = lockfile-0.12.2 +RPM.REQUIRES = foundation-python-pbr +RPM.FILES = "$(PY.ROCKS)/*" diff --git a/src/foundation-python-pbr/Makefile b/src/foundation-python-pbr/Makefile new file mode 100644 index 0000000..9007f44 --- /dev/null +++ b/src/foundation-python-pbr/Makefile @@ -0,0 +1,92 @@ +# --------------------------------------------------- -*- Makefile -*- -- +# $Id: Makefile,v 1.3 2012/11/27 00:48:37 phil Exp $ +# +# @Copyright@ +# +# Rocks(r) +# www.rocksclusters.org +# version 6.2 (SideWindwer) +# version 7.0 (Manzanita) +# +# Copyright (c) 2000 - 2017 The Regents of the University of California. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice unmodified and in its entirety, this list of conditions and the +# following disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# 3. All advertising and press materials, printed or electronic, mentioning +# features or use of this software must display the following acknowledgement: +# +# "This product includes software developed by the Rocks(r) +# Cluster Group at the San Diego Supercomputer Center at the +# University of California, San Diego and its contributors." +# +# 4. Except as permitted for the purposes of acknowledgment in paragraph 3, +# neither the name or logo of this software nor the names of its +# authors may be used to endorse or promote products derived from this +# software without specific prior written permission. The name of the +# software includes the following terms, and any derivatives thereof: +# "Rocks", "Rocks Clusters", and "Avalanche Installer". For licensing of +# the associated name, interested parties should contact Technology +# Transfer & Intellectual Property Services, University of California, +# San Diego, 9500 Gilman Drive, Mail Code 0910, La Jolla, CA 92093-0910, +# Ph: (858) 534-5815, FAX: (858) 534-7345, E-MAIL:invent@ucsd.edu +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# @Copyright@ +# +# $Log: Makefile,v $ +# Revision 1.3 2012/11/27 00:48:37 phil +# Copyright Storm for Emerald Boa +# +# Revision 1.2 2012/05/06 05:48:43 phil +# Copyright Storm for Mamba +# +# Revision 1.1 2012/02/01 20:42:59 phil +# Setuptools needed for MYSQL-python build on Rocks v. 6 +# +# + +PKGROOT = /opt/rocks +REDHAT.ROOT = $(CURDIR)/../../ +-include $(ROCKSROOT)/etc/Rules.mk +include Rules.mk + + +build: + + +$(PACKAGES): + gunzip -c $@.tar.gz | $(TAR) -xf - + mkdir -p $(ROOT)/$(PKGROOT) + ( \ + cd $@; \ + $(PY.PATH) setup.py build; \ + $(PY.PATH) setup.py install --root=$(ROOT); \ + ) + +install:: $(PACKAGES) + + +clean:: + rm -rf V diff --git a/src/foundation-python-pbr/version.mk b/src/foundation-python-pbr/version.mk new file mode 100644 index 0000000..ad50867 --- /dev/null +++ b/src/foundation-python-pbr/version.mk @@ -0,0 +1,5 @@ +NAME = foundation-python-pbr +RELEASE = 0 +VERSION = 3.1.1 +PACKAGES = pbr-3.1.1 +RPM.FILES = "$(PY.ROCKS)/*\\n\/opt/rocks/bin/*" From a1da80a903d0389c1a9654901c75d9c7a99e4d84 Mon Sep 17 00:00:00 2001 From: Philip Papadopoulos Date: Thu, 30 Nov 2017 21:00:57 -0800 Subject: [PATCH 10/12] shorten wait time to 1 minute, instead of 60 --- nodes/rabbitmq-service.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodes/rabbitmq-service.xml b/nodes/rabbitmq-service.xml index 395ca29..5d64472 100644 --- a/nodes/rabbitmq-service.xml +++ b/nodes/rabbitmq-service.xml @@ -146,7 +146,7 @@ extendedKeyUsage = 1.3.6.1.5.5.7.3.1 #!/bin/bash # -for i in `seq 1 360`; # wait for rabbitmq apps configs for 60 minutes +for i in `seq 1 6`; # wait for rabbitmq apps configs for 1 minute do for conf in $( ls /opt/rocks/etc | grep rabbitmq_ ); do app_id=${conf#rabbitmq_} From 0c17dabb394a1b1357c405cdf349f54c5e565742 Mon Sep 17 00:00:00 2001 From: Philip Papadopoulos Date: Fri, 1 Dec 2017 11:50:07 -0800 Subject: [PATCH 11/12] Copyright Storm version 7.0 (typo) --- Makefile | 2 +- bootstrap.sh | 2 +- src/Makefile | 2 +- src/erlang/Makefile | 2 +- src/foundation-python-backports/Makefile | 2 +- src/foundation-python-daemon/Makefile | 2 +- src/foundation-python-lockfile/Makefile | 2 +- src/foundation-python-paramiko/Makefile | 2 +- src/foundation-python-pbr/Makefile | 2 +- src/foundation-python-pika/Makefile | 2 +- src/foundation-python-pycrypto/Makefile | 2 +- src/foundation-python-rabbitmqclient/Makefile | 2 +- src/foundation-python-rabbitmqclient/rabbitmqclient/__init__.py | 2 +- src/foundation-python-tornado/Makefile | 2 +- src/rabbitmq/Makefile | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 52c05a7..7606ee7 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/bootstrap.sh b/bootstrap.sh index 3ce4ea6..0d4c619 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -8,7 +8,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/Makefile b/src/Makefile index 1b5c64d..de514cb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,7 +5,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/erlang/Makefile b/src/erlang/Makefile index 4e2f555..243a6d2 100644 --- a/src/erlang/Makefile +++ b/src/erlang/Makefile @@ -5,7 +5,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/foundation-python-backports/Makefile b/src/foundation-python-backports/Makefile index fa3acac..5047c09 100644 --- a/src/foundation-python-backports/Makefile +++ b/src/foundation-python-backports/Makefile @@ -4,7 +4,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/foundation-python-daemon/Makefile b/src/foundation-python-daemon/Makefile index 9007f44..d7405bb 100644 --- a/src/foundation-python-daemon/Makefile +++ b/src/foundation-python-daemon/Makefile @@ -5,7 +5,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/foundation-python-lockfile/Makefile b/src/foundation-python-lockfile/Makefile index 9007f44..d7405bb 100644 --- a/src/foundation-python-lockfile/Makefile +++ b/src/foundation-python-lockfile/Makefile @@ -5,7 +5,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/foundation-python-paramiko/Makefile b/src/foundation-python-paramiko/Makefile index fa3acac..5047c09 100644 --- a/src/foundation-python-paramiko/Makefile +++ b/src/foundation-python-paramiko/Makefile @@ -4,7 +4,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/foundation-python-pbr/Makefile b/src/foundation-python-pbr/Makefile index 9007f44..d7405bb 100644 --- a/src/foundation-python-pbr/Makefile +++ b/src/foundation-python-pbr/Makefile @@ -5,7 +5,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/foundation-python-pika/Makefile b/src/foundation-python-pika/Makefile index 48aa18b..aff33ae 100644 --- a/src/foundation-python-pika/Makefile +++ b/src/foundation-python-pika/Makefile @@ -4,7 +4,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/foundation-python-pycrypto/Makefile b/src/foundation-python-pycrypto/Makefile index fa3acac..5047c09 100644 --- a/src/foundation-python-pycrypto/Makefile +++ b/src/foundation-python-pycrypto/Makefile @@ -4,7 +4,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/foundation-python-rabbitmqclient/Makefile b/src/foundation-python-rabbitmqclient/Makefile index da28819..dd3b409 100644 --- a/src/foundation-python-rabbitmqclient/Makefile +++ b/src/foundation-python-rabbitmqclient/Makefile @@ -3,7 +3,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/foundation-python-rabbitmqclient/rabbitmqclient/__init__.py b/src/foundation-python-rabbitmqclient/rabbitmqclient/__init__.py index 22814f7..c699d17 100644 --- a/src/foundation-python-rabbitmqclient/rabbitmqclient/__init__.py +++ b/src/foundation-python-rabbitmqclient/rabbitmqclient/__init__.py @@ -5,7 +5,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/foundation-python-tornado/Makefile b/src/foundation-python-tornado/Makefile index 56e5775..663a299 100644 --- a/src/foundation-python-tornado/Makefile +++ b/src/foundation-python-tornado/Makefile @@ -3,7 +3,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. diff --git a/src/rabbitmq/Makefile b/src/rabbitmq/Makefile index 01f647e..a6fca6f 100644 --- a/src/rabbitmq/Makefile +++ b/src/rabbitmq/Makefile @@ -5,7 +5,7 @@ # # Rocks(r) # www.rocksclusters.org -# version 6.2 (SideWindwer) +# version 6.2 (SideWinder) # version 7.0 (Manzanita) # # Copyright (c) 2000 - 2017 The Regents of the University of California. From c2bfed7ae6ec1eadebfc2eda6e480cb6138ebcaf Mon Sep 17 00:00:00 2001 From: Philip Papadopoulos Date: Fri, 10 Mar 2023 14:47:18 -0800 Subject: [PATCH 12/12] update sha1sum for missing-from-google-drive binary --- .rabbitmq-roll.metadata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rabbitmq-roll.metadata b/.rabbitmq-roll.metadata index 07f5669..bcccd9e 100644 --- a/.rabbitmq-roll.metadata +++ b/.rabbitmq-roll.metadata @@ -1,4 +1,4 @@ -3689b217808087320d28feb11dc1dc888b351776 src/erlang/otp_src_18.2.tar.gz 0B0LD0shfkvCRUUMwbHVhZ2hKMkU +af3c4411f18900deb1ddccb61213b843e98d4db5 src/erlang/otp_src_18.2.tar.gz 0B0LD0shfkvCRUUMwbHVhZ2hKMkU c2ac46e48585e5f8f8d57ccc55ca83faa8b53b86 src/foundation-python-lockfile/lockfile-0.12.2.tar.gz 1aO_pv0dVmvocYrV45vwYQU0IVxPx2Eld 30e236b4d5375e04b6f01a51870c80dbdae7d723 src/foundation-python-pbr/pbr-3.1.1.tar.gz 1ZEWu7dnz52GFzP4IudFfhFVWAHAB21Xu e333e9031424611b8974d2b2d2804dd26c4fae8e src/foundation-python-daemon/python-daemon-2.1.2.tar.gz 1uvpdY_dQp_mBRWcJ7EcLFd9fq77voU2i