Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2015-08-29 20:05:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ha-cluster-bootstrap" Changes: -------- --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2015-08-07 00:23:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2015-08-29 20:05:10.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Aug 28 10:25:54 UTC 2015 - kgronlund@suse.com + +- Update to version 0.4+git.1440306826.cf7cfcf: + - Patches are now merged upstream + - Remove 0001-Only-check-for-pseudy-tty-if-in-interactive-mode-bnc.patch + - Remove 0002-Add-administration-Virtual-IP-fate-318549.patch + - Remove 0003-Only-check-watchdog-if-potentially-using-SBD.patch + - Remove 0004-Remove-admin-IP-suggestion-as-it-is-confusing-bsc-93.patch + +- Sync entire /etc/booth directory (fate#319318) +- Add 0001-sync-entire-booth-directory-fate-319318.patch + +------------------------------------------------------------------- +Mon Aug 24 07:18:08 UTC 2015 - kgronlund@suse.com + +- Require ha-cluster-webui instead of hawk (bsc#942723) + +------------------------------------------------------------------- Old: ---- 0001-Only-check-for-pseudy-tty-if-in-interactive-mode-bnc.patch 0002-Add-administration-Virtual-IP-fate-318549.patch 0003-Only-check-watchdog-if-potentially-using-SBD.patch 0004-Remove-admin-IP-suggestion-as-it-is-confusing-bsc-93.patch sleha-bootstrap-0.4+git.1430918556.6f42311.tar.bz2 New: ---- 0001-sync-entire-booth-directory-fate-319318.patch sleha-bootstrap-0.4+git.1440306826.cf7cfcf.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ha-cluster-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.B3dTOb/_old 2015-08-29 20:05:11.000000000 +0200 +++ /var/tmp/diff_new_pack.B3dTOb/_new 2015-08-29 20:05:11.000000000 +0200 @@ -18,28 +18,24 @@ Name: ha-cluster-bootstrap -Version: 0.4+git.1430918556.6f42311 +Version: 0.4+git.1440306826.cf7cfcf Release: 0 Summary: Pacemaker HA Cluster Bootstrap Tool License: GPL-2.0 Group: Productivity/Clustering/HA Url: https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM: Only check for pseudo-tty if in interactive mode (bnc#892702) -Patch1: 0001-Only-check-for-pseudy-tty-if-in-interactive-mode-bnc.patch -# PATCH-FEATURE-UPSTREAM: Add administration Virtual IP (fate#318549) -Patch2: 0002-Add-administration-Virtual-IP-fate-318549.patch -# PATCH-FIX-UPSTREAM: Only check watchdog if potentially using SBD -Patch3: 0003-Only-check-watchdog-if-potentially-using-SBD.patch -# PATCH-FIX-UPSTREAM: Remove admin IP suggestion as it is confusing (bsc#939351) -Patch4: 0004-Remove-admin-IP-suggestion-as-it-is-confusing-bsc-93.patch + +# PATCH-FIX-UPSTREAM: Sync entire /etc/booth directory (fate#319318) +Patch1: 0001-sync-entire-booth-directory-fate-319318.patch Requires: csync2 -Requires: hawk +Requires: ha-cluster-webui Requires: iproute2 Requires: pacemaker Requires: pssh Requires: util-linux +Recommends: hawk Recommends: ocfs2-tools # These three are required for ocfs2 setup, but not generic setup Recommends: parted @@ -52,9 +48,6 @@ %prep %setup -n sleha-bootstrap-%{version} %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %install ++++++ 0001-sync-entire-booth-directory-fate-319318.patch ++++++ commit 2aa8176cb02a36e924270f6c69fc8574bb643ee7 Author: Kristoffer Grönlund <krig@koru.se> Date: Fri Aug 28 12:20:42 2015 +0200 Sync entire /etc/booth directory (fate#319318) Key files may be added in the /etc/booth directory, so we should sync all of the files there. diff --git a/scripts/ha-cluster-init b/scripts/ha-cluster-init index c983658..bc8abc9 100755 --- a/scripts/ha-cluster-init +++ b/scripts/ha-cluster-init @@ -137,7 +137,7 @@ group ha_group { key /etc/csync2/key_hagroup; host $(hostname); - include /etc/booth/booth.conf; + include /etc/booth; include /etc/corosync/corosync.conf; include /etc/corosync/authkey; include /etc/csync2/csync2.cfg; ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.B3dTOb/_old 2015-08-29 20:05:11.000000000 +0200 +++ /var/tmp/diff_new_pack.B3dTOb/_new 2015-08-29 20:05:11.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/tserong/sleha-bootstrap.git</param> - <param name="changesrevision">6f423117528b0c730b17cbeec909caa7ed719f4a</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">cf7cfcf11507bf64493a83ab6c25e1843d7a3717</param></service></servicedata> \ No newline at end of file ++++++ sleha-bootstrap-0.4+git.1430918556.6f42311.tar.bz2 -> sleha-bootstrap-0.4+git.1440306826.cf7cfcf.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-functions 2015-05-08 18:29:54.000000000 +0200 +++ new/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-functions 2015-08-28 12:25:54.000000000 +0200 @@ -458,9 +458,12 @@ warned=1 fi - if ! check_watchdog ; then - warn "No watchdog device found. If SBD is used, the cluster will be unable to start without a watchdog." - warned=1 + local stage="$1" + if [ -z "$stage" -o "$stage" == "join" -o "$stage" == "sbd" ]; then + if ! check_watchdog ; then + warn "No watchdog device found. If SBD is used, the cluster will be unable to start without a watchdog." + warned=1 + fi fi if [ $warned -ne 0 ]; then @@ -472,6 +475,8 @@ check_tty() { + $YES_TO_ALL && return 0 + # Check for pseudo-tty: Cannot display read prompts without a TTY (bnc#892702) if ! tty -s; then error "No pseudo-tty detected! Use -t option to ssh if calling remotely." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-init 2015-05-08 18:29:54.000000000 +0200 +++ new/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-init 2015-08-28 12:25:54.000000000 +0200 @@ -30,6 +30,7 @@ declare SBD_DEVICE declare OCFS2_DEVICE declare TEMPLATE +declare ADMIN_IP usage() { @@ -53,6 +54,9 @@ "storage" stage) -o <dev> Block device to use for OCFS2 (only used in "vgfs" stage) +Options for administration IP template: + -A <ip> IP address to use for the administration virtual IP + Stage can be one of: ssh Create SSH keys for passwordless SSH between cluster nodes csync2 Configure csync2 @@ -62,6 +66,7 @@ cluster Bring the cluster online vgfs Create volume group and filesystem (ocfs2 template only, requires -o <dev>) + admin Create administration virtual IP (optional) Note: - If stage is not specified, the script will run through each stage @@ -592,12 +597,52 @@ wait_for_resource "Waiting for /srv/clusterfs to be mounted" clusterfs:0 } +init_admin() +{ + # Skip this section when -y is passed + # unless $ADMIN_IP is set + $YES_TO_ALL && [ -z $ADMIN_IP ] && return + + local adminaddr + + if [ -z $ADMIN_IP ]; then + status " +Configure Administration IP Address: + Optionally configure an administration virtual IP + address. The purpose of this IP address is to + provide a single IP that can be used to interact + with the cluster, rather than using the IP address + of any specific cluster node. +" + if ! confirm "Do you wish to configure an administration IP?"; then + return + fi + + adminaddr=$(prompt_for_string \ + 'Administration Virtual IP' \ + '([0-9]+\.){3}[0-9]+' "") + [ -z "$adminaddr" ] && error 'No value for admin address' + else + adminaddr="$ADMIN_IP" + fi + + local tmp_conf=/tmp/crm.$$ + cat > $tmp_conf <<END +primitive admin_addr ocf:heartbeat:IPaddr2 \\ + params ip="$adminaddr" \\ + op monitor interval="10" timeout="20" +END + crm_configure_load update $tmp_conf + + wait_for_resource "Waiting for Admin Address" admin_addr +} + #------------------------------------------------------------------------------ # for --help option [ "$1" == "--help" ] && usage -while getopts 'hi:o:p:qs:t:y' o; do +while getopts 'hi:o:p:qs:t:A:y' o; do case $o in h) usage;; i) NET_IF=$OPTARG;; @@ -606,6 +651,7 @@ q) BE_QUIET=true;; s) SBD_DEVICE=$OPTARG;; t) TEMPLATE=$OPTARG;; + A) ADMIN_IP=$OPTARG;; y) YES_TO_ALL=true;; esac done @@ -619,8 +665,8 @@ # just in case this breaks ha-cluster-join on another node). systemctl -q is-active corosync.service rc=$? -if [ "$stage" == "vgfs" ]; then - [ $rc -ne 0 ] && error "Cluster is inactive - can't run vgfs stage" +if [ "$stage" == "vgfs" -o "$stage" == "admin" ]; then + [ $rc -ne 0 ] && error "Cluster is inactive - can't run $stage stage" elif [ "$stage" != "ssh" -a "$stage" != "ssh_remote" -a "$stage" != "csync2" -a "$stage" != "csync2_remote" ]; then [ $rc -eq 0 ] && error "Cluster is currently active - can't run" fi @@ -628,7 +674,7 @@ # Need hostname resolution to work, want NTP (but don't block ssh_remote or csync2_remote) if [ "$stage" != "ssh_remote" -a "$stage" != "csync2_remote" ]; then check_tty - check_prereqs + check_prereqs "$stage" fi case $TEMPLATE in @@ -638,7 +684,7 @@ esac case $stage in -ssh|ssh_remote|csync2|csync2_remote|corosync|storage|sbd|cluster|vgfs) +ssh|ssh_remote|csync2|csync2_remote|corosync|storage|sbd|cluster|vgfs|admin) init # $2 == nasty hack to pick up IP arg to csync2_remote (not strictly # necessary currently, as we're not auto-updating /etc/hosts) @@ -655,6 +701,7 @@ init_sbd init_cluster [ "$TEMPLATE" == "ocfs2" ] && init_vgfs + init_admin ;; *) echo -e "Invalid stage ($1)\n" usage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-join new/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-join --- old/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-join 2015-05-08 18:29:54.000000000 +0200 +++ new/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-join 2015-08-28 12:25:54.000000000 +0200 @@ -260,7 +260,7 @@ check_tty # Need hostname resolution to work, want NTP -check_prereqs +check_prereqs "join" case $1 in ssh|csync2|ssh_merge|cluster)