Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-02-22 08:57:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-02-08
09:47:44.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-02-22
08:58:03.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Feb 19 08:59:06 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1455627181.78fd949:
+ + medium: ui_configure: Only wait for DC if resources were stopped (#117)
+ + medium: hb_report: Don't collect logs on non-nodes (bsc#959031)
+ + low: Fix title style vs. sentence style in cluster scripts (bsc#892108)
+
+-------------------------------------------------------------------
Old:
----
crmsh-2.2.0+git.1454489864.2aa76e4.tar.bz2
New:
----
crmsh-2.2.0+git.1455627181.78fd949.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.mvBgND/_old 2016-02-22 08:58:04.000000000 +0100
+++ /var/tmp/diff_new_pack.mvBgND/_new 2016-02-22 08:58:04.000000000 +0100
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0+
Group: %{pkg_group}
-Version: 2.2.0+git.1454489864.2aa76e4
+Version: 2.2.0+git.1455627181.78fd949
Release: 0
Url: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.mvBgND/_old 2016-02-22 08:58:04.000000000 +0100
+++ /var/tmp/diff_new_pack.mvBgND/_new 2016-02-22 08:58:04.000000000 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">2aa76e41e1f21d6ffbfeb317b214183e4f1ea85b</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">78fd94936f0edc2c9c040b72757aaed024621bc9</param></service></servicedata>
\ No newline at end of file
++++++ crmsh-2.2.0+git.1454489864.2aa76e4.tar.bz2 ->
crmsh-2.2.0+git.1455627181.78fd949.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1454489864.2aa76e4/Makefile.am
new/crmsh-2.2.0+git.1455627181.78fd949/Makefile.am
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/Makefile.am 2016-02-04
08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/Makefile.am 2016-02-19
09:59:06.000000000 +0100
@@ -78,7 +78,6 @@
--record $(DESTDIR)$(pkgpythondir)/install_files.txt \
--verbose
$(INSTALL) -d -m 770 $(DESTDIR)/$(CRM_CACHE_DIR)
- -rm -rf $(generated_docs) $(generated_mans)
uninstall-local:
cat $(DESTDIR)$(pkgpythondir)/install_files.txt | xargs rm -rf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/hb_report/hb_report.in
new/crmsh-2.2.0+git.1455627181.78fd949/hb_report/hb_report.in
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/hb_report/hb_report.in
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/hb_report/hb_report.in
2016-02-19 09:59:06.000000000 +0100
@@ -533,7 +533,6 @@
TO_TIME=$TO_TIME
USER_NODES="$USER_NODES"
NODES="$NODES"
-MASTER_NODE="$MASTER_NODE"
HA_LOG=$HA_LOG
UNIQUE_MSG=$UNIQUE_MSG
SANITIZE="$SANITIZE"
@@ -555,9 +554,6 @@
is_node() {
test "$THIS_IS_NODE"
}
-is_master() {
- ! is_collector && test "$WE" = "$MASTER_NODE"
-}
start_slave_collector() {
local node=$1
@@ -1358,7 +1354,6 @@
THIS_IS_NODE=""
if ! is_collector; then
- MASTER_NODE=$WE
NODES=`getnodes`
debug "nodes: `echo $NODES`"
fi
@@ -1415,10 +1410,11 @@
# part 4: find the logs and cut out the segment for the period
#
-# if the master is also a node, getlog is going to be invoked
-# from the collector
-(is_master && is_node) ||
- getlog
+is_node && getlog
+
+#
+# Start slave collectors
+#
if ! is_collector; then
for node in $NODES; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/modules/cibconfig.py
new/crmsh-2.2.0+git.1455627181.78fd949/modules/cibconfig.py
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/modules/cibconfig.py 2016-02-04
08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/modules/cibconfig.py 2016-02-19
09:59:06.000000000 +0100
@@ -23,7 +23,7 @@
from . import orderedset
from . import cibstatus
from . import crm_gv
-from .ra import get_ra, get_properties_list, get_pe_meta
+from .ra import get_ra, get_properties_list, get_pe_meta, get_properties_meta
from .msg import common_warn, common_err, common_debug, common_info, err_buf
from .msg import common_error, constraint_norefobj_err, cib_parse_err,
no_object_err
from .msg import missing_obj_err, common_warning, update_err, unsupported_err,
empty_cib_err
@@ -2951,6 +2951,19 @@
'''
return self._get_attr_value("property", property)
+ def get_property_w_default(self, prop):
+ '''
+ Get the value of the given property. If it is
+ not set, return the default value.
+ '''
+ v = self.get_property(prop)
+ if v is None:
+ try:
+ v = get_properties_meta().param_default(prop)
+ except:
+ pass
+ return v
+
def get_op_default(self, attr):
'''
Get the value of the attribute from op_defaults.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/modules/ui_configure.py
new/crmsh-2.2.0+git.1455627181.78fd949/modules/ui_configure.py
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/modules/ui_configure.py
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/modules/ui_configure.py
2016-02-19 09:59:06.000000000 +0100
@@ -324,12 +324,7 @@
else:
print v
for p in properties:
- v = cib_factory.get_property(p)
- if v is None:
- try:
- v = ra.get_properties_meta().param_default(p)
- except:
- pass
+ v = cib_factory.get_property_w_default(p)
if v is not None:
print_value(v)
elif truth:
@@ -552,6 +547,7 @@
if not ok or not cib_factory.commit():
raise ValueError("Failed to stop one or more running
resources: %s" %
(', '.join(to_stop)))
+ return len(to_stop)
@command.skill_level('administrator')
@command.completers_repeating(_id_list)
@@ -562,8 +558,8 @@
arg_force = any((x in ('-f', '--force')) for x in argl)
argl = [x for x in argl if (x not in ('-f', '--force'))]
if arg_force or config.core.force:
- self._stop_if_running(argl)
- utils.wait4dc(what="Stopping %s" % (", ".join(argl)))
+ if self._stop_if_running(argl) > 0:
+ utils.wait4dc(what="Stopping %s" % (", ".join(argl)))
return cib_factory.delete(*argl)
@command.name('default-timeouts')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1454489864.2aa76e4/modules/utils.py
new/crmsh-2.2.0+git.1455627181.78fd949/modules/utils.py
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/modules/utils.py 2016-02-04
08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/modules/utils.py 2016-02-19
09:59:06.000000000 +0100
@@ -158,10 +158,18 @@
def is_boolean_true(opt):
+ if opt in (None, False):
+ return False
+ if opt is True:
+ return True
return opt.lower() in ("yes", "true", "on", "1")
def is_boolean_false(opt):
+ if opt in (None, False):
+ return True
+ if opt is True:
+ return False
return opt.lower() in ("no", "false", "off", "0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/apache/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/apache/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/apache/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/apache/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -9,12 +9,12 @@
Configure a resource group containing a virtual IP address and
an instance of the Apache web server.
- You can optionally configure a Filesystem resource which will be
+ You can optionally configure a file system resource which will be
mounted before the web server is started.
You can also optionally configure a database resource which will
be started before the web server but after mounting the optional
- filesystem.
+ file system.
include:
- agent: ocf:heartbeat:apache
name: apache
@@ -34,7 +34,7 @@
- name: id
value: "{{id}}-vip"
- script: filesystem
- shortdesc: Optional filesystem mounted before the web server is started.
+ shortdesc: Optional file system mounted before the web server is started.
required: false
- script: database
shortdesc: Optional database started before the web server is started.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/clvm/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/clvm/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/clvm/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/clvm/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -2,7 +2,7 @@
#
# License: GNU General Public License (GPL)
version: 2.2
-category: Filesystem
+category: File System
shortdesc: Cluster-aware LVM
longdesc: |
Configure a cloned instance of cLVM.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/clvm-vg/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/clvm-vg/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/clvm-vg/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/clvm-vg/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -2,7 +2,7 @@
#
# License: GNU General Public License (GPL)
version: 2.2
-category: Filesystem
+category: File System
shortdesc: Cluster-aware LVM (Volume Group)
longdesc: |
Configures an cLVM volume group instance. Once created,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/db2/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/db2/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/db2/main.yml 2016-02-04
08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/db2/main.yml 2016-02-19
09:59:06.000000000 +0100
@@ -2,9 +2,9 @@
category: Database
shortdesc: IBM DB2 Database
longdesc: >-
- Configure an IBM DB2 database resource, along with a Virtual IP and a
Filesystem.
+ Configure an IBM DB2 database resource, along with a Virtual IP and a file
system mount point.
- Note that the filesystem will be stopped initially, in case you need to run
mkfs.
+ Note that the file system resource will be stopped initially, in case you
need to run mkfs.
include:
- agent: ocf:heartbeat:db2
@@ -25,7 +25,7 @@
- name: id
value: db2-virtual-ip
- script: filesystem
- shortdesc: The filesystem configured here will be mounted before the DB2
instance.
+ shortdesc: The file system configured here will be mounted before the DB2
instance.
parameters:
- name: id
value: db2-fs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/drbd/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/drbd/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/drbd/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/drbd/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -1,5 +1,5 @@
version: 2.2
-category: Filesystem
+category: File System
shortdesc: DRBD Block Device
longdesc: >-
Distributed Replicated Block Device. Configure a DRBD cluster resource.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/exportfs/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/exportfs/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/exportfs/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/exportfs/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -6,26 +6,28 @@
parameters:
- name: id
required: true
- shortdesc: Unique ID for this export in the cluster.
+ shortdesc: Resource ID
+ longdesc: Cluster Resource ID
type: resource
value: exportfs
- name: fsid
+ shortdesc: Unique FSID Within Cluster or Starting FSID for Multiple
Exports
required: true
type: integer
value: 1
- name: directory
required: true
type: string
- shortdesc: Mount point
- longdesc: "The mount point for the filesystem, e.g.: /srv/nfs/home"
+ shortdesc: Mount Point (Directory)
+ longdesc: "The mount point for the file system, e.g.: /srv/nfs/home"
- name: options
required: true
- shortdesc: Mount options
+ shortdesc: Mount Options
longdesc: "Any additional options to be given to the mount command,
for example rw,mountpoint"
type: string
- name: wait_for_leasetime_on_stop
required: false
- shortdesc: Wait for lease time on stop
+ shortdesc: Wait for Lease Time on Stop
longdesc: If set to true, wait for lease on stop.
type: boolean
value: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/filesystem/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/filesystem/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/filesystem/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/filesystem/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -1,6 +1,6 @@
version: 2.2
-category: Filesystem
-shortdesc: Filesystem (mount point)
+category: File System
+shortdesc: File System (mount point)
include:
- agent: ocf:heartbeat:Filesystem
name: filesystem
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/gfs2/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/gfs2/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/gfs2/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/gfs2/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -3,32 +3,32 @@
#
# License: GNU General Public License (GPL)
version: 2.2
-shortdesc: gfs2 filesystem (cloned)
+shortdesc: GFS2 File System (Cloned)
longdesc: >-
- This template generates a cloned instance of the gfs2 filesystem.
- The filesystem should be on the device, unless cLVM is used.
+ This template generates a cloned instance of the GFS2 file system.
+ The file system should be on the device, unless cLVM is used.
-category: Filesystem
+category: File System
include:
- script: gfs2-base
parameters:
- name: id
- shortdesc: Name the gfs2 filesystem
+ shortdesc: File System Resource ID
longdesc: "NB: The clone is going to be named c-<id> (e.g. c-bigfs)"
example: bigfs
required: true
type: resource
- name: directory
- shortdesc: The mount point
+ shortdesc: Mount Point
example: /mnt/bigfs
required: true
type: string
- name: device
- shortdesc: The device
+ shortdesc: Device
required: true
type: string
- name: options
- shortdesc: mount options
+ shortdesc: Mount Options
type: string
required: false
actions:
@@ -47,5 +47,5 @@
meta interleave="true" ordered="true"
- crm: "configure modgroup {{gfs2-base:clvm-group}} add c-{{id}}"
- shortdesc: Add cloned filesystem to cLVM group
+ shortdesc: Add cloned file system to cLVM group
when: "{{gfs2-base:clvm-group}}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/gfs2-base/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/gfs2-base/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/gfs2-base/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/gfs2-base/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -3,11 +3,11 @@
#
# License: GNU General Public License (GPL)
version: 2.2
-category: Filesystem
-shortdesc: gfs2 filesystem base (cloned)
+category: File System
+shortdesc: GFS2 File System Base (Cloned)
longdesc: |
- This template generates a cloned instance of the gfs2 filesystem.
- The filesystem should be on the device, unless clvm is used.
+ This template generates a cloned instance of the GFS2 file system.
+ The file system should be on the device, unless cLVM is used.
parameters:
- name: clvm-group
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/libvirt/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/libvirt/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/libvirt/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/libvirt/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -9,12 +9,12 @@
category: Stonith
parameters:
- name: id
- shortdesc: The resource id (name)
+ shortdesc: Resource ID (Name)
example: stonith-libvirt
required: true
type: resource
- name: target
- shortdesc: Node to manage with stonith device
+ shortdesc: Node to Manage With STONITH Device
type: resource
required: true
- name: hostlist
@@ -39,13 +39,13 @@
required: false
example: power_cycle
type: string
- shortdesc: How to reset a guest.
+ shortdesc: Guest Reset Method
longdesc: >
A guest reset may be done by a sequence of off and on commands
(power_cycle) or by the reboot command. Which method works
depend on the hypervisor and guest configuration management.
- name: install
- shortdesc: Enable to install required packages
+ shortdesc: Enable to Install Required Packages
type: boolean
required: false
value: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/lvm-drbd/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/lvm-drbd/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/lvm-drbd/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/lvm-drbd/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -2,7 +2,7 @@
#
# License: GNU General Public License (GPL)
version: 2.2
-category: Filesystem
+category: File System
shortdesc: LVM Group on DRBD
longdesc: >
Configure a LVM resource group on top of DRBD.
@@ -22,7 +22,7 @@
- name: group_id
type: resource
required: true
- shortdesc: Group resource ID
+ shortdesc: Group Resource ID
value: g-lvm
include:
@@ -41,7 +41,7 @@
value: vg1
- name: example_fs
- shortdesc: Example filesystem resource
+ shortdesc: Example File System Resource
script: filesystem
required: false
parameters:
@@ -55,7 +55,7 @@
actions:
- include: drbd
- include: lvm
- - shortdesc: Configure LVM and filesystem group and constraints
+ - shortdesc: Configure LVM and File System Group and Constraints
cib: |
group {{group_id}} {{lvm:id}}
{{#example_fs:id}}{{example_fs:id}}{{/example_fs:id}}
order o-drbd_before_{{group_id}} inf: ms-{{drbd:id}}:promote
{{group_id}}:start
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/nfsserver/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/nfsserver/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/nfsserver/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/nfsserver/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -5,14 +5,14 @@
category: Server
shortdesc: NFS Server
longdesc: >
- Configure an NFS server. Requires an existing filesystem resource,
- for example a filesystem running on LVM on DRBD.
+ Configure an NFS server. Requires an existing file system resource,
+ for example a file system running on LVM on DRBD.
parameters:
- name: base-id
required: true
- shortdesc: Base filesystem resource ID
- longdesc: The ID of an existing filesystem resource.
+ shortdesc: Base File System Resource ID
+ longdesc: The ID of an existing file system resource.
type: resource
value: base-fs
@@ -20,7 +20,7 @@
- name: rootfs
script: exportfs
required: false
- shortdesc: NFSv4 Virtual File System root.
+ shortdesc: NFSv4 Virtual File System Root
parameters:
- name: id
value: exportfs-root
@@ -33,7 +33,7 @@
- script: exportfs
required: true
- shortdesc: Exported NFS mount point.
+ shortdesc: Exported NFS Mount Point
parameters:
- name: id
value: exportfs
@@ -46,13 +46,13 @@
- script: virtual-ip
required: false
- shortdesc: Configure a Virtual IP address used to access the NFS mounts.
+ shortdesc: Virtual IP Address Used to Access the NFS Mounts
actions:
- crm: "configure show {{base-id}}"
- shortdesc: Ensure that the Filesystem resource exists
+ shortdesc: Ensure That the File System Resource Exists
- install: nfs-client nfs-kernel-server
- shortdesc: Install NFS packages
+ shortdesc: Install NFS Packages
- service:
- nfsserver: enable
- nfsserver: start
@@ -70,4 +70,4 @@
{{/rootfs}}
- call: exportfs -v
error: Failed to configure NFS exportfs
- shortdesc: Check result of exportfs -v
+ shortdesc: Check Result of exportfs -v
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/nfsserver-lvm-drbd/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/nfsserver-lvm-drbd/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/nfsserver-lvm-drbd/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/nfsserver-lvm-drbd/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -53,7 +53,7 @@
value: nfs
- name: example_fs
- shortdesc: Example filesystem resource
+ shortdesc: Example File System Resource
script: filesystem
required: false
parameters:
@@ -109,7 +109,7 @@
- include: drbd
- include: lvm
- - shortdesc: Configure LVM and filesystem group and constraints
+ - shortdesc: Configure LVM and File System Group and Constraints
cib: |
group g-nfs {{lvm:id}}
{{#example_fs:id}}{{example_fs:id}}{{/example_fs:id}}
order o-drbd_before_nfs inf: ms-{{drbd:id}}:promote g-nfs:start
@@ -117,20 +117,20 @@
- include: rootfs
- - shortdesc: Clone root fs resource and configure constraints
+ - shortdesc: Clone Root FS Resource and Configure Constraints
cib: |
clone cl-{{rootfs:id}} {{rootfs:id}}
order o-root_before_nfs Mandatory: cl-{{rootfs:id}} g-nfs:start
colocation c-nfs_on_root inf: g-nfs cl-{{rootfs:id}}
when: rootfs
- include: exportfs
- - shortdesc: Add exportfs resource to group
+ - shortdesc: Add ExportFS Resource to Group
crm: "configure modgroup g-nfs add {{exportfs:id}}"
when: exportfs
- include: virtual-ip
- - shortdesc: Add floating IP address to group
+ - shortdesc: Add Floating IP Address to Group
crm: "configure modgroup g-nfs add {{virtual-ip:id}}"
when: virtual-ip
- call: exportfs -v
error: Failed to configure NFS exportfs
- shortdesc: Check result of exportfs -v
+ shortdesc: Check Result of exportfs -v
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/ocfs2/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/ocfs2/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/ocfs2/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/ocfs2/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -3,44 +3,44 @@
#
# License: GNU General Public License (GPL)
version: 2.2
-category: Filesystem
-shortdesc: OCFS2 Filesystem
+category: File System
+shortdesc: OCFS2 File System
longdesc: >
- Configure an OCFS2 Filesystem resource and add
+ Configure an OCFS2 File System resource and add
it to a cloned DLM base group. OCFS2 uses the
cluster membership services from Pacemaker which
run in user space. Therefore, DLM needs to be
configured as a clone resource that is present on
each node in the cluster.
- The Filesystem resource should be added to a cloned
+ The file system resource should be added to a cloned
group which includes the DLM resource. This wizard
can optionally create both the required DLM resource
and the cloned group. The wizard can be reused to create
- additional OCFS2 Filesystem resources by setting the
+ additional OCFS2 file system resources by setting the
group name to the name of an already-created cloned group.
If you are using cLVM, create the DLM resource and clone
- group using the cLVM wizard. OCFS2 Filesystem resources can
+ group using the cLVM wizard. OCFS2 file system resources can
then be added to the group using this wizard.
parameters:
- name: id
- shortdesc: Name the ocfs2 filesystem resource
+ shortdesc: OCFS2 File System Resource ID
example: bigfs
type: resource
required: true
- name: directory
- shortdesc: The mount point
+ shortdesc: Mount Point
example: /mnt/bigfs
type: string
required: true
- name: device
- shortdesc: The device
+ shortdesc: Device
type: string
required: true
- name: options
- shortdesc: mount options
+ shortdesc: Mount Options
type: string
- name: dlm
shortdesc: Create DLM Resource and Cloned Group
@@ -73,4 +73,4 @@
op monitor interval=20s timeout=40s
- crm: configure modgroup {{group}} add {{id}}
- shortdesc: Add the OCFS2 Filesystem to the cloned group
+ shortdesc: Add the OCFS2 File System to the Cloned Group
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/raid-lvm/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/raid-lvm/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/raid-lvm/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/raid-lvm/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -1,11 +1,11 @@
version: 2.2
-category: Filesystem
-shortdesc: RAID hosting LVM
+category: File System
+shortdesc: RAID Hosting LVM
longdesc: "Configure a RAID 1 host based mirror together with a cluster
manager LVM volume group and LVM volumes."
parameters:
- name: id
- shortdesc: ID for the RAID and LVM group.
- longdesc: Filesystems that should be mounted in the LVM can be added to
this group resource.
+ shortdesc: RAID and LVM Group ID
+ longdesc: File systems that should be mounted in the LVM can be added to
this group resource.
type: resource
value: g-raid
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sap-as/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sap-as/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sap-as/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sap-as/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -6,7 +6,7 @@
1) Virtual IP address for the SAP ASCS instance,
- 2) A filesystem on shared storage (/usr/sap/SID/ASCS##),
+ 2) A file system on shared storage (/usr/sap/SID/ASCS##),
3) SAPInstance for ASCS.
@@ -41,12 +41,12 @@
- name: nic
value: eth0
- script: filesystem
- shortdesc: "Filesystem resource for the /usr/sap/SID/ASCS## directory."
+ shortdesc: "File system resource for the /usr/sap/SID/ASCS## directory"
longdesc: >-
- If a filesystem does not already exist on the block device
+ If a file system does not already exist on the block device
specified here, you will need to run mkfs to create it, prior
- to starting the filesystem resource. You will also need
- to create the mountpoint directory on all cluster nodes.
+ to starting the file system resource. You will also need
+ to create the mount point directory on all cluster nodes.
parameters:
- name: id
value: rsc_fs_NA0_sapna0as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sap-ci/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sap-ci/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sap-ci/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sap-ci/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -6,7 +6,7 @@
1) Virtual IP address for the SAP Central instance,
- 2) A filesystem on shared storage (/usr/sap/SID/DVEBMGS##),
+ 2) A file system on shared storage (/usr/sap/SID/DVEBMGS##),
3) SAPInstance for the Central Instance.
@@ -41,12 +41,12 @@
- name: nic
value: eth0
- script: filesystem
- shortdesc: "Filesystem resource for the /usr/sap/SID/DVEBMGS## directory."
+ shortdesc: "File system resource for the /usr/sap/SID/DVEBMGS## directory."
longdesc: >-
- If a filesystem does not already exist on the block device
+ If a file system does not already exist on the block device
specified here, you will need to run mkfs to create it, prior
- to starting the filesystem resource. You will also need
- to create the mountpoint directory on all cluster nodes.
+ to starting the file system resource. You will also need
+ to create the mount point directory on all cluster nodes.
parameters:
- name: id
value: rsc_fs_NA0_sapna0ci
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sap-db/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sap-db/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sap-db/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sap-db/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -6,7 +6,7 @@
1) A virtual IP address for the SAP database instance,
- 2) A filesystem on shared storage (/sapdb),
+ 2) A file system on shared storage (/sapdb),
3) SAPinstance for the database.
@@ -34,12 +34,12 @@
- name: nic
value: eth0
- script: filesystem
- shortdesc: "Filesystem resource for the SAP database (typically /sapdb)."
+ shortdesc: "File system resource for the SAP database (typically /sapdb)."
longdesc: >-
- If a filesystem does not already exist on the block device
+ If a file system does not already exist on the block device
specified here, you will need to run mkfs to create it, prior
- to starting the filesystem resource. You will also need
- to create the mountpoint directory on all cluster nodes.
+ to starting the file system resource. You will also need
+ to create the mount point directory on all cluster nodes.
parameters:
- name: id
value: rsc_fs_NA0_sapna0db
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sap-simple-stack/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sap-simple-stack/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sap-simple-stack/main.yml
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sap-simple-stack/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -11,7 +11,7 @@
3) A cluster manager LVM volume group and LVM volumes on the RAID 1 host
based mirror,
- 4) Filesystems on shared storage for sapmnt, /sapbd and /usr/sap,
+ 4) File systems on shared storage for sapmnt, /sapbd and /usr/sap,
5) SAPinstance for - ASCS, a Database, a Central Instance.
@@ -34,7 +34,7 @@
- script: lvm
required: true
- shortdesc: LVM logical volumes for the SAP filesystems.
+ shortdesc: LVM logical volumes for the SAP file systems.
parameters:
- name: volgrpname
value: sapvg
@@ -42,7 +42,7 @@
- script: filesystem
name: filesystem-sapmnt
required: true
- shortdesc: Filesystem resource for the sapmnt directory.
+ shortdesc: File system resource for the sapmnt directory.
parameters:
- name: id
value: rsc_fs_NA0_sapmnt
@@ -57,7 +57,7 @@
- script: filesystem
name: filesystem-usrsap
required: true
- shortdesc: Filesystem resource for the /usr/sap directory.
+ shortdesc: File system resource for the /usr/sap directory.
parameters:
- name: id
value: rsc_fs_NA0_usrsap
@@ -88,12 +88,12 @@
- script: filesystem
name: filesystem-db
- shortdesc: "Filesystem resource for the SAP database (typically /sapdb)."
+ shortdesc: "File system resource for the SAP database (typically /sapdb)."
longdesc: >-
- If a filesystem does not already exist on the block device
+ If a file system does not already exist on the block device
specified here, you will need to run mkfs to create it, prior
- to starting the filesystem resource. You will also need
- to create the mountpoint directory on all cluster nodes.
+ to starting the file system resource. You will also need
+ to create the mount point directory on all cluster nodes.
parameters:
- name: id
value: rsc_fs_NA0_sapna0db
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sap-simple-stack-plus/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sap-simple-stack-plus/main.yml
---
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sap-simple-stack-plus/main.yml
2016-02-04 08:00:04.000000000 +0100
+++
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sap-simple-stack-plus/main.yml
2016-02-19 09:59:06.000000000 +0100
@@ -10,12 +10,12 @@
3) A cluster manager LVM volume group and LVM volumes on the RAID 1 host
based mirror,
- 4) Filesystems on shared storage for sapmnt, /sapbd, /usr/sap/SID/ASCS## and
/usr/sap/SID/DVEBMGS##,
+ 4) File systems on shared storage for sapmnt, /sapbd, /usr/sap/SID/ASCS##
and /usr/sap/SID/DVEBMGS##,
5) SAPinstance for - ASCS, a Database, a Central Instance.
The difference between this and the SimpleStack is that the ASCS and CI have
their own
- volumes/filesystems/mountpoints rather than just one
volume/filesystem/mountpoint on /usr/sap.
+ volumes / file systems / mount points rather than just one volume / file
system / mount point on /usr/sap.
parameters:
- name: id
@@ -36,7 +36,7 @@
- script: lvm
required: true
- shortdesc: LVM logical volumes for the SAP filesystems.
+ shortdesc: LVM logical volumes for the SAP file systems.
parameters:
- name: volgrpname
value: sapvg
@@ -44,7 +44,7 @@
- script: filesystem
name: filesystem-sapmnt
required: true
- shortdesc: Filesystem resource for the sapmnt directory.
+ shortdesc: File system resource for the sapmnt directory.
parameters:
- name: id
value: rsc_fs_NA0_sapmnt
@@ -59,7 +59,7 @@
- script: filesystem
name: filesystem-usrsap
required: true
- shortdesc: Filesystem resource for the /usr/sap directory.
+ shortdesc: File system resource for the /usr/sap directory.
parameters:
- name: id
value: rsc_fs_NA0_usrsap
@@ -89,12 +89,12 @@
value: eth0
- script: filesystem
name: filesystem-db
- shortdesc: "Filesystem resource for the SAP database (typically /sapdb)."
+ shortdesc: "File system resource for the SAP database (typically /sapdb)."
longdesc: >-
- If a filesystem does not already exist on the block device
+ If a file system does not already exist on the block device
specified here, you will need to run mkfs to create it, prior
- to starting the filesystem resource. You will also need
- to create the mountpoint directory on all cluster nodes.
+ to starting the file system resource. You will also need
+ to create the mount point directory on all cluster nodes.
parameters:
- name: id
value: rsc_fs_NA0_sapna0db
@@ -131,12 +131,12 @@
value: eth0
- script: filesystem
name: filesystem-as
- shortdesc: "Filesystem resource for the /usr/sap/SID/ASCS## directory."
+ shortdesc: "File system resource for the /usr/sap/SID/ASCS## directory."
longdesc: >-
- If a filesystem does not already exist on the block device
+ If a file system does not already exist on the block device
specified here, you will need to run mkfs to create it, prior
- to starting the filesystem resource. You will also need
- to create the mountpoint directory on all cluster nodes.
+ to starting the file system resource. You will also need
+ to create the mount point directory on all cluster nodes.
parameters:
- name: id
value: rsc_fs_NA0_sapna0as
@@ -173,12 +173,12 @@
value: eth0
- script: filesystem
name: filesystem-ci
- shortdesc: "Filesystem resource for the /usr/sap/SID/DVEBMGS## directory."
+ shortdesc: "File system resource for the /usr/sap/SID/DVEBMGS## directory."
longdesc: >-
- If a filesystem does not already exist on the block device
+ If a file system does not already exist on the block device
specified here, you will need to run mkfs to create it, prior
- to starting the filesystem resource. You will also need
- to create the mountpoint directory on all cluster nodes.
+ to starting the file system resource. You will also need
+ to create the mount point directory on all cluster nodes.
parameters:
- name: id
value: rsc_fs_NA0_sapna0ci
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sbd/main.yml
new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sbd/main.yml
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/scripts/sbd/main.yml 2016-02-04
08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/scripts/sbd/main.yml 2016-02-19
09:59:06.000000000 +0100
@@ -15,12 +15,12 @@
parameters:
- name: id
- shortdesc: The resource id (name)
+ shortdesc: Resource ID (Name)
example: stonith-sbd
required: true
type: resource
- name: sbd_device
- shortdesc: Name of the device (shared disk)
+ shortdesc: Device Name (Shared Disk)
longdesc: >
Shared device used by SBD. Make sure that the device
remains the same on reboots. It's preferable to use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/test/testcases/scripts.exp
new/crmsh-2.2.0+git.1455627181.78fd949/test/testcases/scripts.exp
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/test/testcases/scripts.exp
2016-02-04 08:00:04.000000000 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/test/testcases/scripts.exp
2016-02-19 09:59:06.000000000 +0100
@@ -29,12 +29,12 @@
clvm Cluster-aware LVM
clvm-vg Cluster-aware LVM (Volume Group)
drbd DRBD Block Device
-filesystem Filesystem (mount point)
-gfs2 gfs2 filesystem (cloned)
-gfs2-base gfs2 filesystem base (cloned)
+filesystem File System (mount point)
+gfs2 GFS2 File System (Cloned)
+gfs2-base GFS2 File System Base (Cloned)
lvm-drbd LVM Group on DRBD
-ocfs2 OCFS2 Filesystem
-raid-lvm RAID hosting LVM
+ocfs2 OCFS2 File System
+raid-lvm RAID Hosting LVM
SAP:
@@ -76,12 +76,12 @@
clvm Cluster-aware LVM
clvm-vg Cluster-aware LVM (Volume Group)
drbd DRBD Block Device
-filesystem Filesystem (mount point)
-gfs2 gfs2 filesystem (cloned)
-gfs2-base gfs2 filesystem base (cloned)
+filesystem File System (mount point)
+gfs2 GFS2 File System (Cloned)
+gfs2-base GFS2 File System Base (Cloned)
lvm-drbd LVM Group on DRBD
-ocfs2 OCFS2 Filesystem
-raid-lvm RAID hosting LVM
+ocfs2 OCFS2 File System
+raid-lvm RAID Hosting LVM
SAP:
