Merge pull request #3776 from kgaillot/release3

Backport fixes for 3.0.0-rc3

.gitignore

@@ -223,7 +223,6 @@ TAGS
 /doc/sphinx/*/conf.py
 /doc/sphinx/*/generated
 /doc/sphinx/build-[0-9]*.txt
-/doc/sphinx/shared/images/*.png
 
 # Test artifacts (from unit tests, regression tests, static analysis, etc.)
 *.coverity

INSTALL.md

@@ -49,7 +49,6 @@ Also:
 | Linux-HA style fencing agents                   |                | cluster-glue-libs-devel | libglue-devel           | cluster-glue-dev        |
 | documentation                                   |                | asciidoc or asciidoctor | asciidoc or asciidoctor | asciidoc or asciidoctor |
 | documentation                                   |                | help2man                | help2man                | help2man                |
-| documentation                                   |                | inkscape                | inkscape                | inkscape                |
 | documentation                                   |                | docbook-style-xsl       | docbook-xsl-stylesheets | docbook-xsl             |
 | documentation                                   |                | python3-sphinx          | python3-sphinx          | python3-sphinx          |
 | documentation (PDF)                             |                | latexmk texlive texlive-capt-of texlive-collection-xetex texlive-fncychap texlive-framed texlive-multirow texlive-needspace texlive-tabulary texlive-titlesec texlive-threeparttable texlive-upquote texlive-wrapfig texlive-xetex | texlive texlive-latex  | texlive texlive-latex-extra |

agents/ocf/ping.in

@@ -368,7 +368,7 @@ hosts_family() {
     return $family
 }
 
-integer=$(echo ${OCF_RESKEY_timeout} | egrep -o '[0-9]*')
+integer=$(echo ${OCF_RESKEY_timeout} | $EGREP -o '[0-9]*')
 case "${OCF_RESKEY_timeout}" in
     *[0-9]ms|*[0-9]msec) OCF_RESKEY_timeout=$(expr $integer / 1000);;
     *[0-9]m|*[0-9]min) OCF_RESKEY_timeout=$(expr $integer \* 60);;

configure.ac

@@ -931,7 +931,6 @@ dnl ==============================================
 AC_PATH_PROGS([ASCIIDOC_CONV], [asciidoc asciidoctor])
 AC_PATH_PROG([HELP2MAN], [help2man])
 AC_PATH_PROG([SPHINX], [sphinx-build])
-AC_PATH_PROG([INKSCAPE], [inkscape])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 AC_PATH_PROG([XMLCATALOG], [xmlcatalog])
 
@@ -976,8 +975,7 @@ AM_CONDITIONAL([BUILD_ASCIIDOC], [test "x${ASCIIDOC_CONV}" != x])
 AS_IF([test x"${ASCIIDOC_CONV}" != x""],
       [PCMK_FEATURES="$PCMK_FEATURES ascii-docs"])
 
-AM_CONDITIONAL([BUILD_SPHINX_DOCS],
-               [test x"${SPHINX}" != x"" && test x"${INKSCAPE}" != x""])
+AM_CONDITIONAL([BUILD_SPHINX_DOCS], [test x"${SPHINX}" != x""])
 AM_COND_IF([BUILD_SPHINX_DOCS], [PCMK_FEATURES="$PCMK_FEATURES books"])
 
 dnl Pacemaker's shell scripts (and thus man page builders) rely on GNU getopt

cts/README.md

@@ -309,22 +309,3 @@ without requiring a password to be entered each time:
 
   If this works without prompting for a password, you're in business.
   If not, look at the documentation for your version of ssh.
-
-
-## Upgrading scheduler test inputs for new XSLTs
-
-The scheduler/xml inputs should be kept in sync with the latest major schema
-version, since these tests are not meant to test schema upgrades (unless
-expressly designated as such).
-
-To upgrade the inputs to a new major schema version:
-
-    cd "$(git rev-parse --show-toplevel)/xml"
-    ./regression.sh cts_scheduler -G
-    cd "$(git rev-parse --show-toplevel)/cts"
-    git add --interactive .
-    git commit -m 'Test: scheduler: upgrade test inputs to schema $X.$Y'
-    ./cts-scheduler || echo 'Investigate what went wrong'
-
-The first two commands can be run anytime to verify no further upgrades are
-needed.

cts/cts-exec.in

@@ -308,11 +308,13 @@ class ExecTests(Tests):
             os.system("service pacemaker_remote stop")
         self.cleanup_environment()
 
-        if self.tls and not os.path.isfile("/etc/pacemaker/authkey"):
-            print("Installing /etc/pacemaker/authkey ...")
-            os.system("mkdir -p /etc/pacemaker")
-            os.system("dd if=/dev/urandom of=/etc/pacemaker/authkey bs=4096 count=1")
-            self._installed_files.append("/etc/pacemaker/authkey")
+        # @TODO Support the option of using specified existing certificates
+        authkey = "%s/authkey" % BuildOptions.PACEMAKER_CONFIG_DIR
+        if self.tls and not os.path.isfile(authkey):
+            print("Installing %s ..." % authkey)
+            os.system("mkdir -p %s" % BuildOptions.PACEMAKER_CONFIG_DIR)
+            os.system("dd if=/dev/urandom of=%s bs=4096 count=1" % authkey)
+            self._installed_files.append(authkey)
 
         # If we're in build directory, install agents if not already installed
         # pylint: disable=protected-access

doc/sphinx/Makefile.am

@@ -43,32 +43,31 @@ SPHINXFLAGS	?=
 # End of useful overrides
 
 
-# Example scheduler transition graphs
-# @TODO The original CIB XML for these is long lost. Ideally, we would recreate
-# something similar and keep those here instead of the DOTs (or use a couple of
-# scheduler regression test inputs instead), then regenerate the SVG
-# equivalents using crm_simulate and dot when making a release.
-DOTS =	$(wildcard shared/images/*.dot)
-
-# Vector sources for generated PNGs (including SVG equivalents of DOTS, created
-# manually using dot)
-SVGS =	$(wildcard shared/images/pcmk-*.svg) \
-	$(DOTS:%.dot=%.svg)
-
-# PNG images generated from SVGS
+# All images needed by the documentation are PNGs (added to the source
+# repository and distributions). Some of these PNGs can be regenerated
+# manually from DOT and/or SVG sources (also in the source repository, but
+# not distributed).
 #
-# These will not be accessible in a VPATH build, which will generate warnings
-# when building the documentation, but the make will still succeed. It is
-# nontrivial to get them working for VPATH builds and not worth the effort.
-PNGS_GENERATED	= $(SVGS:%.svg=%.png)
-
-# Original PNG image sources
-PNGS_Clusters_from_Scratch = $(wildcard Clusters_from_Scratch/images/*.png)
-PNGS_Pacemaker_Explained   = $(wildcard Pacemaker_Explained/images/*.png)
+# To regenerate an SVG from a DOT, you can use dot:
+#
+#    dot $NAME.dot -Tsvg > $NAME.svg
+#
+# To regenerate a PNG from an SVG, you can use Inkscape (>= 1.0):
+#
+#    inkscape --export-dpi=90 -C --export-filename=$NAME.png $NAME.svg
+#
+# @TODO The original CIB XML for the example scheduler transitions
+# (Policy-Engine-*) is long lost. Ideally, we would recreate something similar
+# and keep that XML here (or use a couple of scheduler regression test inputs
+# instead). Then the DOTs could be regenerated as well, using crm_simulate.
+PNGS_shared			= $(wildcard shared/images/*.png)
+PNGS_Clusters_from_Scratch	= $(wildcard Clusters_from_Scratch/images/*.png)
+PNGS_Pacemaker_Explained	= $(wildcard Pacemaker_Explained/images/*.png)
 
 STATIC_FILES	= $(wildcard _static/*.css)
 
-EXTRA_DIST	= $(wildcard */*.rst) $(DOTS) $(SVGS)			\
+EXTRA_DIST	= $(wildcard */*.rst) 					\
+		  $(PNGS_shared)					\
 		  $(PNGS_Clusters_from_Scratch)				\
 		  $(PNGS_Pacemaker_Explained)				\
 		  $(wildcard Pacemaker_Python_API/_templates/*rst) 	\
@@ -81,8 +80,8 @@ BOOK_RSYNC_DEST	= $(RSYNC_PACKAGE_DEST)/doc/$(PACKAGE_SERIES)
 
 BOOK		= none
 
-DEPS_intro			= shared/pacemaker-intro.rst \
-				  $(PNGS_GENERATED)
+DEPS_intro			= shared/pacemaker-intro.rst	\
+				  $(PNGS_shared)
 
 DEPS_Clusters_from_Scratch	= $(DEPS_intro) 		\
 				  $(PNGS_Clusters_from_Scratch)
@@ -94,18 +93,6 @@ DEPS_Pacemaker_Python_API 	= ../../python
 
 if BUILD_SPHINX_DOCS
 
-INKSCAPE_CMD	= $(INKSCAPE) --export-dpi=90 -C
-
-# Pattern rule to generate PNGs from SVGs
-# (--export-png works with Inkscape <1.0, --export-filename with >=1.0;
-# create the destination directory in case this is a VPATH build)
-%.png: %.svg
-	$(AM_V_at)-$(MKDIR_P) "$(shell dirname "$@")"
-	$(AM_V_GEN) {							\
-		$(INKSCAPE_CMD) --export-png="$@" "$<" 2>/dev/null	\
-		|| $(INKSCAPE_CMD) --export-filename="$@" "$<";		\
-	} $(PCMK_quiet)
-
 # Create a book's Sphinx configuration.
 # Create the book directory in case this is a VPATH build.
 $(BOOKS:%=%/conf.py): conf.py.in
@@ -221,5 +208,4 @@ clean-local:
 	$(AM_V_at)-rm -rf				\
 		$(BOOKS:%="$(builddir)/%/_build")	\
 		$(BOOKS:%="$(builddir)/%/conf.py")	\
-		$(BOOKS:%="$(builddir)/%/generated")	\
-		$(PNGS_GENERATED)
+		$(BOOKS:%="$(builddir)/%/generated")