From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lon Hohberger Date: Tue, 13 Oct 2009 11:46:57 -0400 Subject: [Cluster-devel] [PATCH 1/2] rgmanager: Pull DRBD metadata from upstream git Message-ID: <1255448818-18865-1-git-send-email-lhh@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Prevents schema breakage for users using drbd.sh Signed-off-by: Lon Hohberger --- rgmanager/src/resources/Makefile | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/resources/Makefile b/rgmanager/src/resources/Makefile index 049f3cb..dedf7fc 100644 --- a/rgmanager/src/resources/Makefile +++ b/rgmanager/src/resources/Makefile @@ -12,11 +12,13 @@ RESOURCES=service.sh ip.sh nfsclient.sh nfsexport.sh \ apache.sh openldap.sh samba.sh mysql.sh \ postgres-8.sh tomcat-5.sh lvm.sh \ vm.sh SAPInstance SAPDatabase named.sh \ - ASEHAagent.sh drbd.sh + ASEHAagent.sh METADATA=apache.metadata openldap.metadata samba.metadata \ mysql.metadata postgres-8.metadata tomcat-5.metadata \ - named.metadata lvm.metadata drbd.metadata + named.metadata lvm.metadata + +EXTERNAL_METADATA="http://git.drbd.org/?p=drbd-8.3.git;a=blob_plain;f=scripts/drbd.metadata.rhcs;hb=HEAD" EVENT_TARGETS= \ default_event_script.sl \ @@ -99,11 +101,21 @@ resources.rng: $(RESOURCES) $(TARGET2) $(TARGET3) ra2rng.xsl ra2ref.xsl echo " ./$$f"; \ bash ./$$f meta-data | xsltproc ra2rng.xsl - >> resources.rng; \ done + @echo Pulling in external metadata... + @for f in $(EXTERNAL_METADATA); do \ + echo " $$f"; \ + curl "$$f" | xsltproc ra2rng.xsl - >> resources.rng; \ + done cat resources.rng.mid >> resources.rng @echo Generating per-resource RelaxNG reference information... @for f in $(RESOURCES) $(TARGET2) $(TARGET3); do \ echo " ./$$f"; \ bash ./$$f meta-data | xsltproc ra2ref.xsl - >> resources.rng; \ done + @echo Pulling in external metadata... + @for f in $(EXTERNAL_METADATA); do \ + echo " $$f"; \ + curl "$$f" | xsltproc ra2ref.xsl - >> resources.rng; \ + done cat resources.rng.tail >> resources.rng -- 1.6.2.5