Merge pull request #1473 from kgaillot/changes20

Rename pacemaker daemons

.gitignore

@@ -66,26 +66,25 @@ Doxyfile
 /cts/cts
 /cts/cts-cli
 /cts/cts-coverage
-/cts/cts-lrmd
-/cts/cts-pengine
+/cts/cts-exec
+/cts/cts-fencing
 /cts/cts-regression
-/cts/cts-stonithd
+/cts/cts-scheduler
 /cts/fence_dummy
 /cts/lxc_autogen.sh
 /cts/pacemaker-cts-dummyd
 /cts/[email protected]
+/daemons/execd/pacemaker_remote
+/daemons/execd/pacemaker_remote.service
+/daemons/fenced/fence_legacy
 /daemons/pacemakerd/pacemaker
 /daemons/pacemakerd/pacemaker.combined.upstart
 /daemons/pacemakerd/pacemaker.service
 /daemons/pacemakerd/pacemaker.upstart
 extra/logrotate/pacemaker
-/fencing/fence_legacy
 include/config.h
 include/config.h.in
 include/crm_config.h
-lrmd/pacemaker_remote
-lrmd/pacemaker_remoted
-lrmd/pacemaker_remote.service
 publican.cfg
 /tools/cibsecret
 /tools/crm_error
@@ -105,47 +104,44 @@ publican.cfg
 *.8
 *.8.xml
 *.8.html
-attrd/attrd
 doc/*/en-US/images/*.png
 doc/*/tmp/**
 doc/*/publish
-cib/cib
-cib/cibmon
-cib/cibpipe
-crmd/atest
-crmd/crmd
+/daemons/attrd/pacemaker-attrd
+/daemons/based/pacemaker-based
+/daemons/based/cibmon
+/daemons/controld/pacemaker-controld
+/daemons/execd/cts-exec-helper
+/daemons/execd/pacemaker-execd
+/daemons/execd/pacemaker-remoted
+/daemons/fenced/cts-fence-helper
+/daemons/fenced/pacemaker-fenced
+/daemons/fenced/pacemaker-fenced.xml
 /daemons/pacemakerd/pacemakerd
+/daemons/schedulerd/pacemaker-schedulerd
+/daemons/schedulerd/pacemaker-schedulerd.xml
+/daemons/schedulerd/ptest
 doc/api/*
 doc/Clusters_from_Scratch.txt
 doc/Pacemaker_Explained.txt
 doc/acls.html
 doc/crm_fencing.html
 doc/publican-catalog*
-fencing/stonith-test
-fencing/stonith_admin
-fencing/stonithd
-fencing/stonithd.xml
-lrmd/lrmd
-lrmd/lrmd_internal_ctl
-lrmd/lrmd_test
-pengine/pengine
-pengine/pengine.xml
-pengine/ptest
 scratch
-tools/attrd_updater
-tools/cibadmin
-tools/crm_attribute
-tools/crm_diff
-tools/crm_mon
-tools/crm_node
-tools/crm_resource
-tools/crm_shadow
-tools/crm_simulate
-tools/crm_verify
-tools/crmadmin
-tools/iso8601
-tools/crm_ticket
-tools/report.collector.1
+/tools/attrd_updater
+/tools/cibadmin
+/tools/crmadmin
+/tools/crm_attribute
+/tools/crm_diff
+/tools/crm_mon
+/tools/crm_node
+/tools/crm_resource
+/tools/crm_shadow
+/tools/crm_simulate
+/tools/crm_ticket
+/tools/crm_verify
+/tools/iso8601
+/tools/stonith_admin
 xml/crm.dtd
 xml/pacemaker*.rng
 xml/versions.rng
@@ -168,25 +164,26 @@ lib/gnu/stdalign.h
 
 # Test detritus
 /cts/.regression.failed.diff
-/cts/pengine/*.ref
-/cts/pengine/*.up
-/cts/pengine/*.up.err
-/cts/pengine/bug-rh-1097457.log
-/cts/pengine/bug-rh-1097457.trs
-/cts/pengine/shadow.*
+/cts/scheduler/*.ref
+/cts/scheduler/*.up
+/cts/scheduler/*.up.err
+/cts/scheduler/bug-rh-1097457.log
+/cts/scheduler/bug-rh-1097457.trs
+/cts/scheduler/shadow.*
 /cts/test-suite.log
 /xml/test-2/*.up
 /xml/test-2/*.up.err
 
 # Formerly built files (helps when jumping back and forth in checkout)
+/attrd
+/cib
 /coverage.sh
+/crmd
 /cts/HBDummy
-/fencing/regression.py
-/lrmd/regression.py
+/fencing
+/lrmd
 /mcp
-/pengine/.regression.failed.diff
-/pengine/regression.core.sh
-/pengine/test10/shadow.*
+/pengine
 
 #Other 
 mock

.travis.yml

@@ -62,7 +62,7 @@ before_script:
 
 script: 
 - if test ${CC} != cov-build; then sudo make install-exec-local || true; fi
-- if test ${CC} != cov-build; then make && ./cts/cts-regression -V; fi
+- if test ${CC} != cov-build; then make && ./cts/cts-regression -V cli scheduler exec; fi
 - if test ${CC} = cov-build; then export CC=gcc; bash ./travisci_build_coverity_scan.sh; fi
 
 #after_script:

GNUmakefile

@@ -325,9 +325,7 @@ summary:
 	@printf "\n- Update source tarball to revision: `git log --pretty=format:%h -n 1`"
 	@printf "\n- Changesets: `git log --pretty=oneline $(LAST_RELEASE)..HEAD | wc -l`"
 	@printf "\n- Diff:      "
-	@git diff -r $(LAST_RELEASE)..HEAD --stat \
-		include lib daemons pengine/*.c pengine/*.h \
-		cib crmd fencing lrmd tools xml | tail -n 1
+	@git diff -r $(LAST_RELEASE)..HEAD --stat include lib daemons tools xml | tail -n 1
 
 rc-changes:
 	@make NEXT_RELEASE=$(shell echo $(LAST_RC) | sed s:-rc.*::) LAST_RELEASE=$(LAST_RC) changes
@@ -336,18 +334,19 @@ changes: summary
 	@printf "\n- Features added since $(LAST_RELEASE)\n"
 	@git log --pretty=format:'  +%s' --abbrev-commit $(LAST_RELEASE)..HEAD | grep -e Feature: | sed -e 's@Feature:@@' | sort -uf
 	@printf "\n- Changes since $(LAST_RELEASE)\n"
-	@git log --pretty=format:'  +%s' --abbrev-commit $(LAST_RELEASE)..HEAD | grep -e High: -e Fix: -e Bug | sed -e 's@Fix:@@' -e s@High:@@ -e s@Fencing:@fencing:@ -e 's@Bug@ Bug@' -e s@PE:@pengine:@ | sort -uf
+	@git log --pretty=format:'  +%s' --abbrev-commit $(LAST_RELEASE)..HEAD | grep -e High: -e Fix: -e Bug | sed -e 's@Fix:@@' -e s@High:@@ -e s@Fencing:@fencing:@ -e 's@Bug@ Bug@' -e s@PE:@scheduler:@ -e s@pengine:@scheduler:@ | sort -uf
 
 changelog:
 	@make changes > ChangeLog
 	@printf "\n">> ChangeLog
 	git show $(LAST_RELEASE):ChangeLog >> ChangeLog
 	@echo -e "\033[1;35m -- Don't forget to run the bumplibs.sh script! --\033[0m"
 
+DO_NOT_INDENT = lib/gnu daemons/controld/controld_fsa.h
+
 indent:
-	find . -name "*.h" -exec ./p-indent \{\} \;
-	find . -name "*.c" -exec ./p-indent \{\} \;
-	git co HEAD crmd/fsa_proto.h lib/gnu
+	find . -name "*.[ch]" -exec ./p-indent \{\} \;
+	git co HEAD $(DO_NOT_INDENT)
 
 rel-tags: tags
 	find . -name TAGS -exec sed -i 's:\(.*\)/\(.*\)/TAGS:\2/TAGS:g' \{\} \;
@@ -360,7 +359,7 @@ CLANG_checkers =
 # --inconclusive --std=posix
 CPPCHECK_ARGS ?=
 cppcheck:
-	for d in replace lib daemons attrd pengine cib crmd fencing lrmd tools; \
+	for d in replace lib daemons tools; \
 		do cppcheck $(CPPCHECK_ARGS) -q $$d; \
 	done
 

Makefile.am

@@ -11,8 +11,7 @@ MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure DRF/config-h.in \
                         DRF/stamp-h.in libtool.m4 ltdl.m4
 
 # Only these will get installed with a plain "make install"
-CORE_INSTALL	= replace include lib daemons \
-		  attrd pengine cib crmd fencing lrmd tools xml
+CORE_INSTALL	= replace include lib daemons tools xml
 
 # Only these will get built with a plain "make" or "make clean"
 CORE		= $(CORE_INSTALL) cts

README.markdown

@@ -51,8 +51,8 @@ This is not an exhaustive list:
 
 [clufter](https://github.com/jnpkrn/clufter) is a general-purpose tool
 for converting one cluster representation format to another. Among other
-possibilities, it can convert from a CMAN+rgmanager-based cluster to
-a corosync+pacemaker-based one. See its documentation for details.
+possibilities, it can convert from a cluster based on rgmanager with CMAN to
+a one based on pacemaker with corosync. See its documentation for details.
 
 ## How can I help?