Hello community,
here is the log from the commit of package hawk for openSUSE:Factory checked in at 2015-04-27 13:05:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hawk (Old)
and /work/SRC/openSUSE:Factory/.hawk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2015-04-03 14:34:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2015-04-27 13:05:20.000000000 +0200
@@ -1,0 +2,18 @@
+Sun Apr 26 19:57:09 UTC 2015 - kgronlund@suse.com
+
+- Update to version 0.7.0+git.1430078135.9e13c3c:
+ + Controller: Use sanitize() to enable HTML in the primitive editing flash
+ + Model: Fix use of @errors before it is created in CibObject
+ + Model: Add model object for CIB tags
+ + Model: Add @tags list in Cib object, feature check for tags support
+ + Model: Store template reference and node id in Cib elements
+ + Wizard: First version of MariaDB wizard (fate#318550)
+ + Model: No need to feature-check when getting tags from CIB
+ + Model: Improving the Tag model object
+ + CibController: Add tags to output
+ + Wizard: Remove GFS2 wizard (bsc#923964)
+ + Wizard: Reorder wizards in the UI
+ + Gemfile: Require sprockets ~> 3.0
+ + Vagrant: Install a dummy index.html for the clustered web servers
+
+-------------------------------------------------------------------
Old:
----
hawk-0.7.0+git.1427954675.b847dc9.tar.bz2
New:
----
hawk-0.7.0+git.1430078135.9e13c3c.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk.spec ++++++
--- /var/tmp/diff_new_pack.LjABsb/_old 2015-04-27 13:05:21.000000000 +0200
+++ /var/tmp/diff_new_pack.LjABsb/_new 2015-04-27 13:05:21.000000000 +0200
@@ -39,7 +39,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 0.7.0+git.1427954675.b847dc9
+Version: 0.7.0+git.1430078135.9e13c3c
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
@@ -79,7 +79,7 @@
BuildRequires: rubygem(%{rb_default_ruby_abi}:rails:4.2)
BuildRequires: rubygem(%{rb_default_ruby_abi}:rake:10.4)
BuildRequires: rubygem(%{rb_default_ruby_abi}:spring:1.3)
-BuildRequires: rubygem(%{rb_default_ruby_abi}:sprockets:2.12)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:sprockets:3.0)
BuildRequires: rubygem(%{rb_default_ruby_abi}:tilt:1.4)
BuildRequires: rubygem(%{rb_default_ruby_abi}:web-console:2.1)
%if 0%{?bundle_gems}
@@ -91,7 +91,7 @@
Requires: rubygem(%{rb_default_ruby_abi}:puma:2.11)
Requires: rubygem(%{rb_default_ruby_abi}:rails:4.2)
Requires: rubygem(%{rb_default_ruby_abi}:rake:10.4)
-Requires: rubygem(%{rb_default_ruby_abi}:sprockets:2.12)
+Requires: rubygem(%{rb_default_ruby_abi}:sprockets:3.0)
Requires: rubygem(%{rb_default_ruby_abi}:tilt:1.4)
%endif
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.LjABsb/_old 2015-04-27 13:05:21.000000000 +0200
+++ /var/tmp/diff_new_pack.LjABsb/_new 2015-04-27 13:05:21.000000000 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/hawk.git</param>
- <param name="changesrevision">b847dc9ce2dc2cefda9d9def081d3670ac67c3fd</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">9e13c3cd7ed7477185be65976355c8f996957b44</param></service></servicedata>
\ No newline at end of file
++++++ hawk-0.7.0+git.1427954675.b847dc9.tar.bz2 -> hawk-0.7.0+git.1430078135.9e13c3c.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/attributes/node.rb new/hawk-0.7.0+git.1430078135.9e13c3c/chef/cookbooks/hawk/attributes/node.rb
--- old/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/attributes/node.rb 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/chef/cookbooks/hawk/attributes/node.rb 2015-04-26 21:56:59.000000000 +0200
@@ -35,3 +35,5 @@
default["hawk"]["node"]["ssh_host"] = "10.13.37.10"
default["hawk"]["node"]["ssh_check"] = "/usr/sbin/crm_mon -1"
+
+default["hawk"]["node"]["apache_index"] = "/srv/www/htdocs/index.html"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/recipes/node.rb new/hawk-0.7.0+git.1430078135.9e13c3c/chef/cookbooks/hawk/recipes/node.rb
--- old/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/recipes/node.rb 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/chef/cookbooks/hawk/recipes/node.rb 2015-04-26 21:56:59.000000000 +0200
@@ -101,6 +101,16 @@
end
end
+template node["hawk"]["node"]["apache_index"] do
+ source "index.html.erb"
+ owner "root"
+ group "root"
+ mode 0644
+ variables(
+ :hostname => node[:hostname]
+ )
+end
+
bash "apache_port" do
user "root"
cwd "/etc/apache2"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/templates/default/index.html.erb new/hawk-0.7.0+git.1430078135.9e13c3c/chef/cookbooks/hawk/templates/default/index.html.erb
--- old/hawk-0.7.0+git.1427954675.b847dc9/chef/cookbooks/hawk/templates/default/index.html.erb 1970-01-01 01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/chef/cookbooks/hawk/templates/default/index.html.erb 2015-04-26 21:56:59.000000000 +0200
@@ -0,0 +1,11 @@
+
+<html>
+ <head>
+ <title>Cluster web server test</title>
+ </head>
+ <body>
+ <h1>Cluster web server test</h1>
+ <p>This is node <%= @hostname %>.
+ </p>
+ </body>
+</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/Gemfile new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/Gemfile
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/Gemfile 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/Gemfile 2015-04-26 21:56:59.000000000 +0200
@@ -46,7 +46,7 @@
gem 'puma', '~> 2.11.1'
gem 'fast_gettext', '~> 0.9.2'
gem 'gettext_i18n_rails', '~> 1.2.0'
-gem 'sprockets', '~> 2.12.3'
+gem 'sprockets', '~> 3.0'
gem 'tilt', '~> 1.4.1'
group :development do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/cib_controller.rb new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/controllers/cib_controller.rb
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/cib_controller.rb 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/controllers/cib_controller.rb 2015-04-26 21:56:59.000000000 +0200
@@ -111,7 +111,8 @@
:nodes_label => n_('1 node configured', '%{num} nodes configured', cib.nodes.length) % { :num => cib.nodes.length },
:resources_label => n_('1 resource configured', '%{num} resources configured', cib.resource_count) % { :num => cib.resource_count },
- :booth => cib.booth
+ :booth => cib.booth,
+ :tags => cib.tags
}
cib.nodes.each do |n|
@@ -162,6 +163,7 @@
:tickets => cib.tickets,
:nodes => cib.nodes,
:resources => cib.resources,
+ :tags => cib.tags,
# eventaully want constraints, op_defaults, rsc_defaults, ...
# Note: passing localized labels here, because we can't wrap an arbitrary number of plurals in _gettext.js
:nodes_label => n_('1 node configured', '%{num} nodes configured', cib.nodes.length) % { :num => cib.nodes.length },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/primitives_controller.rb new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/controllers/primitives_controller.rb
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/controllers/primitives_controller.rb 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/controllers/primitives_controller.rb 2015-04-26 21:56:59.000000000 +0200
@@ -60,9 +60,10 @@
end
@res = Primitive.new params[:primitive] # RORSCAN_ITL (mass ass. OK)
if @res.save
+ #TODO: broken in Rails 4
edit_url = url_for(:action => 'edit', :id => @res.id)
edit_link = "#{@res.id}</a>"
- flash[:highlight] = (_('Resource created successfully') + ': ' + edit_link).html_safe
+ flash[:highlight] = _('Resource created successfully') + ": " + edit_link
redirect_to :action => 'new'
else
render :action => 'new'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/models/cib.rb new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/models/cib.rb
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/models/cib.rb 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/models/cib.rb 2015-04-26 21:56:59.000000000 +0200
@@ -71,6 +71,7 @@
res[:class] = elem.attributes['class']
res[:provider] = elem.attributes['provider'] # This will be nil for LSB resources
res[:type] = elem.attributes['type']
+ res[:template] = elem.attributes['template']
res[:instances] = {}
# This is a bit of a hack to ensure we have a complete set of instances later
res[:clone_max] = clone_max if clone_max
@@ -223,7 +224,7 @@
# use for reporting errors when editing resources. This
# should almost certainly be changed.
attr_reader :dc, :epoch, :nodes, :resources, :templates, :crm_config, :rsc_defaults, :op_defaults, :errors, :resource_count
- attr_reader :tickets
+ attr_reader :tickets, :tags
attr_reader :resources_by_id
attr_reader :booth
@@ -291,6 +292,7 @@
@nodes = []
@xml.elements.each('cib/configuration/nodes/node') do |n|
uname = n.attributes['uname']
+ id = n.attributes['id']
state = :unclean
maintenance = @crm_config[:"maintenance-mode"] ? true : false
ns = @xml.elements["cib/status/node_state[@uname='#{uname}']"]
@@ -315,6 +317,7 @@
@nodes << {
:uname => uname,
:state => state,
+ :id => id,
:maintenance => maintenance
}
end
@@ -339,6 +342,14 @@
}
end if Util.has_feature?(:rsc_template)
+ @tags = []
+ @xml.elements.each('cib/configuration/tags/tag') do |t|
+ @tags << {
+ :id => t.attributes['id'],
+ :refs => t.elements.collect('obj_ref') { |ref| ref.attributes['id'] }
+ }
+ end
+
# Iterate nodes in cib order here which makes the faked up clone & ms instance
# IDs be in the same order as pacemaker
for node in @nodes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/models/cib_object.rb new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/models/cib_object.rb
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/models/cib_object.rb 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/models/cib_object.rb 2015-04-26 21:56:59.000000000 +0200
@@ -91,7 +91,7 @@
def find(id, attr='id')
begin
xml = REXML::Document.new(Invoker.instance.cibadmin('-Ql', '--xpath',
- "//configuration//*[self::node or self::primitive or self::template or self::clone or self::group or self::master or self::rsc_order or self::rsc_colocation or self::rsc_location or self::rsc_ticket or self::acl_role or self::acl_target][@#{attr}='#{id}']"))
+ "//configuration//*[self::node or self::primitive or self::template or self::clone or self::group or self::master or self::rsc_order or self::rsc_colocation or self::rsc_location or self::rsc_ticket or self::acl_role or self::acl_target or self::tag][@#{attr}='#{id}']"))
raise CibObject::CibObjectError, _('Unable to parse cibadmin output') unless xml.root
elem = xml.elements[1]
obj = class_from_element_name(elem.name).instantiate(elem)
@@ -158,7 +158,8 @@
'rsc_location' => Location,
'rsc_ticket' => Ticket,
'acl_role' => Role,
- 'acl_target' => User
+ 'acl_target' => User,
+ 'tag' => Tag,
}
@@map[name]
end
@@ -168,6 +169,7 @@
protected
def error(msg)
+ @errors ||= {}
@errors[:base] ||= []
@errors[:base] << msg
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/models/tag.rb new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/models/tag.rb
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/models/tag.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/models/tag.rb 2015-04-26 21:56:59.000000000 +0200
@@ -0,0 +1,67 @@
+class Tag < CibObject
+ include FastGettext::Translation
+
+ @attributes = :refs
+ attr_accessor *@attributes
+
+ def initialize(attributes = nil)
+ @refs = []
+ super
+ end
+
+ def validate
+ error _('Empty tag') if @refs.empty?
+ end
+
+ def create
+ if CibObject.exists?(id)
+ error _('The ID "%{id}" is already in use') % { :id => @id }
+ return false
+ end
+
+ cmd = "tag #{@id}:"
+ @refs.each do |r|
+ cmd += " #{r}"
+ end
+
+ result = Invoker.instance.crm_configure cmd
+ unless result == true
+ error _('Unable to create tag: %{msg}') ^ { :msg => result }
+ return false
+ end
+
+ true
+ end
+
+ def update
+ # Saving an existing tag
+ unless CibObject.exists?(id, 'tag')
+ error _('Tag ID "%{id}" does not exist') % { :id => @id }
+ return false
+ end
+
+ begin
+ # TODO
+ # FIXME
+ #merge_nvpairs(@xml, 'meta_attributes', @meta)
+
+ Invoker.instance.cibadmin_replace @xml.to_s
+ rescue NotFoundError, SecurityError, RuntimeError => e
+ error e.message
+ return false
+ end
+
+ true
+ end
+
+ class << self
+ def instantiate(xml)
+ res = allocate
+ res.instance_variable_set(:@refs, xml.elements.collect('obj_ref') {|e| e.attributes['id'] })
+ res
+ end
+ def all
+ super "tag"
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/views/primitives/_form.html.erb new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/views/primitives/_form.html.erb
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/app/views/primitives/_form.html.erb 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/app/views/primitives/_form.html.erb 2015-04-26 21:56:59.000000000 +0200
@@ -319,7 +319,7 @@
</script>
<%= form_for([ @cib, @res ]) do |f| %>
<% flash.each do |flash_type, message| %>
- <div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %> ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=h message %></div>
+ <div id="flash-<%= flash_type %>" class="ui-state-<%= flash_type %> ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%= sanitize(message) %></div>
<% end %>
<% @res.errors.values.flatten.each do |message| %>
<div class="ui-state-error ui-corner-all" style="padding: 0.5em; margin-bottom: 0.5em;"><%=raw inject_linebreaks(message) %></div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/templates/mariadb.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/templates/mariadb.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/templates/mariadb.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/templates/mariadb.xml 2015-04-26 21:56:59.000000000 +0200
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<template name="mariadb">
+
+<shortdesc lang="en">MariaDB SQL Database</shortdesc>
+<longdesc lang="en">
+Create a resource for the MariaDB SQL Database.
+</longdesc>
+
+<parameters>
+
+<parameter name="id" required="1">
+<shortdesc lang="en">Resource ID</shortdesc>
+<longdesc lang="en">
+Unique ID for this Apache resource in the cluster.
+</longdesc>
+<content type="string" default="sqldb"/>
+</parameter>
+
+<parameter name="datadir">
+<shortdesc lang="en">Data directory</shortdesc>
+<longdesc lang="en">
+Directory containing databases</longdesc>
+<content type="string"/>
+</parameter>
+
+<parameter name="config">
+<shortdesc lang="en">MariaDB configuration file</shortdesc>
+<longdesc lang="en">
+Full pathname of the database configuration file</longdesc>
+<content type="string"/>
+</parameter>
+
+<parameter name="user">
+<shortdesc lang="en">Database user</shortdesc>
+<longdesc lang="en">
+Name of system user running the database instance.
+</longdesc>
+<content type="string"/>
+</parameter>
+
+<parameter name="group">
+<shortdesc lang="en">Database group</shortdesc>
+<longdesc lang="en">
+Group which the system user running the database instance belongs to.
+</longdesc>
+<content type="string"/>
+</parameter>
+
+
+</parameters>
+
+
+primitive <insert param="id"/> ocf:heartbeat:mysql
+ params
+ test_table=""
+ <if set="datadir">datadir="<insert param="datadir"/>"</if>
+ <if set="config">config="<insert param="config"/>"</if>
+ <if set="user">user="<insert param="user"/>"</if>
+ <if set="group">group="<insert param="group"/>"</if>
+ op start timeout="120" op stop timeout="120"
+ op monitor interval="20" timeout="30"
+
+
+</template>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/15-virtual-ip.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/15-virtual-ip.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/15-virtual-ip.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/15-virtual-ip.xml 2015-04-26 21:56:59.000000000 +0200
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<workflow name="15-virtual-ip">
+<shortdesc lang="en">Virtual IP</shortdesc>
+<longdesc lang="en">
+Create a virtual IP resource.
+</longdesc>
+<templates>
+<template name="virtual-ip" required="1">
+<stepdesc lang="en">
+Configure the virtual IP.
+</stepdesc>
+</template>
+</templates>
+
+
+</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/21-ocfs2-single.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/21-ocfs2-single.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/21-ocfs2-single.xml 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/21-ocfs2-single.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<workflow name="21-ocfs2-single">
-
-<shortdesc lang="en">OCFS2 (Additional)</shortdesc>
-<longdesc lang="en">
-Configure an additional OCFS2 filesystem. If you have already
-created one OCFS2 filesystem, this will add a second one, dependant
-on the base DLM clone which already exists. Note that the OCFS2
-filesystem will be stopped initially, in case you need to run
-mkfs to create the filesystem.
-</longdesc>
-
-<parameters>
-<stepdesc lang="en">
-Specify the ID of an exising clone resource which contains DLM.
-This is necessary to ensure that DLM is running prior to starting
-the OCFS2 filesystem.
-</stepdesc>
-<parameter name="base-clone" required="1">
-<shortdesc lang="en">Base Clone</shortdesc>
-<longdesc lang="en">
-ID of an existing clone DLM resource.
-</longdesc>
-<content type="string" default="base-clone"/>
-</parameter>
-</parameters>
-
-<templates>
-<template name="filesystem" required="1">
-<stepdesc lang="en">
-If an OCFS2 filesystem 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.
-</stepdesc>
-<override name="id" value="clusterfs-2"/>
-<override name="fstype" value="ocfs2"/>
-<override name="directory" value="/srv/clusterfs-2"/>
-</template>
-</templates>
-
-
-clone c-<insert param="id" from_template="filesystem"/> <insert param="id" from_template="filesystem"/>
- meta interleave="true" target-role="Stopped"
-order base-then-<insert param="id" from_template="filesystem"/>
- inf: <insert param="base-clone"/> c-<insert param="id" from_template="filesystem"/>
-colocation <insert param="id" from_template="filesystem"/>-with-base
- inf: c-<insert param="id" from_template="filesystem"/> <insert param="base-clone"/>
-
-
-</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/30-mariadb.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/30-mariadb.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/30-mariadb.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/30-mariadb.xml 2015-04-26 21:56:59.000000000 +0200
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<workflow name="30-mariadb">
+
+<shortdesc lang="en">MariaDB SQL Database</shortdesc>
+<longdesc lang="en">Configures a standalone MariaDB database instance.
+
+Note: This wizard does not configure the SQL database itself,
+only the cluster resource which manages it.
+</longdesc>
+
+<templates>
+<template name="mariadb" required="1">
+<stepdesc lang="en">
+The MariaDB resource.
+</stepdesc>
+</template>
+</templates>
+
+
+
+
+</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/40-drbd.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/40-drbd.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/40-drbd.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/40-drbd.xml 2015-04-26 21:56:59.000000000 +0200
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<workflow name="40-drbd">
+
+<shortdesc lang="en">DRBD</shortdesc>
+<longdesc lang="en">
+Configure a DRBD cluster resource. Also creates a multistate resource
+wrapping the DRBD resource.
+</longdesc>
+
+<parameters>
+<stepdesc lang="en">
+The ID specified here is for the DRBD cluster resource.
+</stepdesc>
+
+<parameter name="id" required="1">
+<shortdesc lang="en">Cluster Resource ID</shortdesc>
+<longdesc lang="en">
+ Unique ID for the DRBD cluster resource. Also used as
+ the base for the created multistate cluster resource.
+</longdesc>
+<content type="string" default="drbd-data"/>
+</parameter>
+
+<parameter name="drbd_resource" required="1">
+<shortdesc lang="en">DRBD Resource</shortdesc>
+<longdesc lang="en">
+The name of the DRBD resource from the DRBD configuration file.
+</longdesc>
+<content type="string" default="drbd0"/>
+</parameter>
+
+<parameter name="drbdconf">
+<shortdesc lang="en">DRBD config file</shortdesc>
+<longdesc lang="en">
+Full pathname of the DRBD configuration file</longdesc>
+<content type="string" default="/etc/drbd.conf"/>
+</parameter>
+
+</parameters>
+
+<templates>
+
+</templates>
+
+
+primitive <insert param="id"/> ocf:linbit:drbd
+ params
+ drbd_resource="<insert param="drbd_resource"/>"
+<if set="drbdconf">
+ drbdconf="<insert param="drbdconf"/>"
+</if>
+ op monitor depth="0" timeout="20" interval="20" role="Slave"
+ op monitor depth="0" timeout="20" interval="10" role="Master"
+
+ms ms-<insert param="id"/> <insert param="id"/>
+ params master-max=1 master-node-max=1 clone-max=2 clone-node-max=1
+ meta notify=true
+
+
+</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/52-sap-db.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/52-sap-db.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/52-sap-db.xml 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/52-sap-db.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<workflow name="52-sap-db">
-
-<shortdesc lang="en">SAP Database Instance</shortdesc>
-<longdesc lang="en">
- Configure a SAP database instance including: 1) virtual IP addresses for the SAP database instance 2) a fileystems on shared storage /sapdb, 3) SAPinstance for the database.
-</longdesc>
-
-<parameters>
- <stepdesc lang="en">
- The ID specified here is for the SAP Database instance resource group.
- </stepdesc>
- <parameter name="id" required="1">
- <shortdesc lang="en">Group ID</shortdesc>
- <longdesc lang="en">
- Unique ID for the SAP Database instance resource group in the cluster.
- </longdesc>
- <content type="string" default="grp_sapdb_NA0"/>
- </parameter>
-</parameters>
-
-<templates>
- <template name="sapdb" required="1">
- <stepdesc lang="en">
- This is the SAP Database instance.
- </stepdesc>
- </template>
-
- <template name="sap-virtual-ip-db" type="virtual-ip" required="1">
- <stepdesc lang="en">
- The IP address configured here will be for the SAP Database instance.
- </stepdesc>
- <override name="id" value="rsc_ip_NA0_sapna0db"/>
- <override name="ip" value="172.17.2.54"/>
- <override name="netmask" value="24"/>
- <override name="nic" value="eth0"/>
- </template>
-
- <template name="sap-filesystem-sapdb" type="filesystem" required="1">
- <stepdesc lang="en">
- This filesystem is for the SAP database
- (typically mounted on /sapdb).
-
- If a filesystem 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.
- </stepdesc>
- <override name="id" value="rsc_fs_NA0_sapdb"/>
- <override name="directory" value="/sapdb"/>
- <override name="options" value="noatime,barrier=0,data=writeback"/>
- <override name="operations" value="op stop timeout=300 op monitor interval=30 timeout=130"/>
- </template>
-</templates>
-
-
-group <insert param="id" />
- <insert param="id" from_template="sap-virtual-ip-db"/>
- <insert param="id" from_template="sap-filesystem-sapdb"/>
- <insert param="id" from_template="sapdb"/>
- meta target-role=stopped
-
-
-</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/53-sap-as.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/53-sap-as.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/53-sap-as.xml 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/53-sap-as.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<workflow name="53-sap-as">
-
-<shortdesc lang="en">SAP ASCS Instance</shortdesc>
-<longdesc lang="en">
- Configure a SAP ASCS instance including: 1) virtual IP addresses for the SAP ASCS instance 2) a fileystems on shared storage /usr/sap/SID/ASCS##, 3) SAPinstance for ASCS.
-</longdesc>
-
-<parameters>
- <stepdesc lang="en">
- The ID specified here is for the SAP ASCS resource group.
- </stepdesc>
- <parameter name="id" required="1">
- <shortdesc lang="en">Group ID</shortdesc>
- <longdesc lang="en">
- Unique ID for the SAP ASCS instance resource group in the cluster.
- </longdesc>
- <content type="string" default="grp_sap_NA0_sapna0as"/>
- </parameter>
-</parameters>
-
-<templates>
- <template name="sap-sapinst-as" type="sapinstance" required="1">
- <stepdesc lang="en">
- This is the SAP ASCS instance.
- </stepdesc>
- <override name="id" value="rsc_sapinst_NA0_ASCS00_sapna0as"/>
- <override name="InstanceName" value="NA0_ASCS00_sapna0as"/>
- <override name="START_PROFILE" value="/usr/sap/NA0/SYS/profile/START_ASCS00_sapna0as"/>
- </template>
-
- <template name="sap-virtual-ip-as" type="virtual-ip" required="1">
- <stepdesc lang="en">
- The IP address configured here will be for the SAP ASCS instance.
- </stepdesc>
- <override name="id" value="rsc_ip_NA0_sapna0as"/>
- <override name="ip" value="172.17.2.53"/>
- <override name="netmask" value="24"/>
- <override name="nic" value="eth0"/>
- </template>
-
- <template name="sap-filesystem-sapas" type="filesystem" required="1">
- <stepdesc lang="en">
- This filesystem is for the /usr/sap/SID/ASCS## directory.
-
- If a filesystem 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.
- </stepdesc>
- <override name="id" value="rsc_fs_NA0_sapna0as"/>
- <override name="directory" value="/usr/sap/NA0/ASCS00"/>
- <override name="options" value="noatime,barrier=0,data=writeback"/>
- <override name="operations" value="op stop timeout=300 op monitor interval=30 timeout=130"/>
- </template>
-</templates>
-
-
-group <insert param="id" />
- <insert param="id" from_template="sap-virtual-ip-as"/>
- <insert param="id" from_template="sap-filesystem-sapas"/>
- <insert param="id" from_template="sap-sapinst-as"/>
- meta target-role=stopped
-
-
-</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/54-sap-ci.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/54-sap-ci.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/54-sap-ci.xml 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/54-sap-ci.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<workflow name="54-sap-ci">
-
-<shortdesc lang="en">SAP Central Instance</shortdesc>
-<longdesc lang="en">
- Configure a SAP Central Instance including: 1) virtual IP addresses for the SAP ASCS instance 2) a fileystems on shared storage /usr/sap/SID/DVEBMGS##, 3) SAPinstance for the Central Instance.
-</longdesc>
-
-<parameters>
- <stepdesc lang="en">
- The ID specified here is for the SAP Central Instance resource group.
- </stepdesc>
- <parameter name="id" required="1">
- <shortdesc lang="en">Group ID</shortdesc>
- <longdesc lang="en">
- Unique ID for the SAP Central Instance resource group in the cluster.
- </longdesc>
- <content type="string" default="grp_sap_NA0_sapna0ci"/>
- </parameter>
-</parameters>
-
-<templates>
- <template name="sap-sapinst-ci" type="sapinstance" required="1">
- <stepdesc lang="en">
- This is the SAP Central instance.
- </stepdesc>
- <override name="id" value="rsc_sapinst_NA0_DVEBMGS01_sapna0ci"/>
- <override name="InstanceName" value="NA0_DVEBMGS01_sapna0ci"/>
- <override name="START_PROFILE" value="/usr/sap/NA0/SYS/profile/START_DVEBMGS01_sapna0ci"/>
- </template>
-
- <template name="sap-virtual-ip-ci" type="virtual-ip" required="1">
- <stepdesc lang="en">
- The IP address configured here will be for the SAP Central Instance.
- </stepdesc>
- <override name="id" value="rsc_ip_NA0_sapna0ci"/>
- <override name="ip" value="172.17.2.55"/>
- <override name="netmask" value="24"/>
- <override name="nic" value="eth0"/>
- </template>
-
- <template name="sap-filesystem-sapci" type="filesystem" required="1">
- <stepdesc lang="en">
- This filesystem is for the /usr/sap/SID/DVEBMGS## directory.
-
- If a filesystem 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.
- </stepdesc>
- <override name="id" value="rsc_fs_NA0_sapna0ci"/>
- <override name="directory" value="/usr/sap/NA0/DVEBMGS01"/>
- <override name="options" value="noatime,barrier=0,data=writeback"/>
- <override name="operations" value="op stop timeout=300 op monitor interval=30 timeout=130"/>
- </template>
-</templates>
-
-
-group <insert param="id" />
- <insert param="id" from_template="sap-virtual-ip-ci"/>
- <insert param="id" from_template="sap-filesystem-sapci"/>
- <insert param="id" from_template="sap-sapinst-ci"/>
- meta target-role=stopped
-
-
-</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/drbd.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/drbd.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/drbd.xml 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/drbd.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<workflow name="drbd">
-
-<shortdesc lang="en">DRBD</shortdesc>
-<longdesc lang="en">
-Configure a DRBD cluster resource. Also creates a multistate resource
-wrapping the DRBD resource.
-</longdesc>
-
-<parameters>
-<stepdesc lang="en">
-The ID specified here is for the DRBD cluster resource.
-</stepdesc>
-
-<parameter name="id" required="1">
-<shortdesc lang="en">Cluster Resource ID</shortdesc>
-<longdesc lang="en">
- Unique ID for the DRBD cluster resource. Also used as
- the base for the created multistate cluster resource.
-</longdesc>
-<content type="string" default="drbd-data"/>
-</parameter>
-
-<parameter name="drbd_resource" required="1">
-<shortdesc lang="en">DRBD Resource</shortdesc>
-<longdesc lang="en">
-The name of the DRBD resource from the DRBD configuration file.
-</longdesc>
-<content type="string" default="drbd0"/>
-</parameter>
-
-<parameter name="drbdconf">
-<shortdesc lang="en">DRBD config file</shortdesc>
-<longdesc lang="en">
-Full pathname of the DRBD configuration file</longdesc>
-<content type="string" default="/etc/drbd.conf"/>
-</parameter>
-
-</parameters>
-
-<templates>
-
-</templates>
-
-
-primitive <insert param="id"/> ocf:linbit:drbd
- params
- drbd_resource="<insert param="drbd_resource"/>"
-<if set="drbdconf">
- drbdconf="<insert param="drbdconf"/>"
-</if>
- op monitor depth="0" timeout="20" interval="20" role="Slave"
- op monitor depth="0" timeout="20" interval="10" role="Master"
-
-ms ms-<insert param="id"/> <insert param="id"/>
- params master-max=1 master-node-max=1 clone-max=2 clone-node-max=1
- meta notify=true
-
-
-</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/gfs2.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/gfs2.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/gfs2.xml 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/gfs2.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<workflow name="gfs2">
-
-<shortdesc lang="en">GFS2 Filesystem</shortdesc>
-<longdesc lang="en">
-Configure an GFS2 filesystem, along with required dependencies
-(DLM). Note that the GFS2 filesystem will be stopped initially,
-in case you need to run mkfs to create the filesystem after DLM
-is running.
-</longdesc>
-
-<templates>
-<template name="filesystem" required="1">
-<stepdesc lang="en">
-If an GFS2 filesystem 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.
-</stepdesc>
-<override name="id" value="clusterfs"/>
-<override name="fstype" value="gfs2"/>
-<override name="directory" value="/srv/clusterfs"/>
-</template>
-</templates>
-
-
-primitive dlm ocf:pacemaker:controld
- op start timeout="90" op stop timeout="100"
- op monitor interval="60" timeout="60"
-group g-<insert param="id" from_template="filesystem"/>
- dlm
- <insert param="id" from_template="filesystem"/>
-clone c-<insert param="id" from_template="filesystem"/>
- g-<insert param="id" from_template="filesystem"/>
- meta interleave="true" target-role="Stopped"
-
-
-</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/ocfs2-single.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/ocfs2-single.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/ocfs2-single.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/ocfs2-single.xml 2015-04-26 21:56:59.000000000 +0200
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<workflow name="21-ocfs2-single">
+
+<shortdesc lang="en">OCFS2 (Additional)</shortdesc>
+<longdesc lang="en">
+Configure an additional OCFS2 filesystem. If you have already
+created one OCFS2 filesystem, this will add a second one, dependant
+on the base DLM clone which already exists. Note that the OCFS2
+filesystem will be stopped initially, in case you need to run
+mkfs to create the filesystem.
+</longdesc>
+
+<parameters>
+<stepdesc lang="en">
+Specify the ID of an exising clone resource which contains DLM.
+This is necessary to ensure that DLM is running prior to starting
+the OCFS2 filesystem.
+</stepdesc>
+<parameter name="base-clone" required="1">
+<shortdesc lang="en">Base Clone</shortdesc>
+<longdesc lang="en">
+ID of an existing clone DLM resource.
+</longdesc>
+<content type="string" default="base-clone"/>
+</parameter>
+</parameters>
+
+<templates>
+<template name="filesystem" required="1">
+<stepdesc lang="en">
+If an OCFS2 filesystem 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.
+</stepdesc>
+<override name="id" value="clusterfs-2"/>
+<override name="fstype" value="ocfs2"/>
+<override name="directory" value="/srv/clusterfs-2"/>
+</template>
+</templates>
+
+
+clone c-<insert param="id" from_template="filesystem"/> <insert param="id" from_template="filesystem"/>
+ meta interleave="true" target-role="Stopped"
+order base-then-<insert param="id" from_template="filesystem"/>
+ inf: <insert param="base-clone"/> c-<insert param="id" from_template="filesystem"/>
+colocation <insert param="id" from_template="filesystem"/>-with-base
+ inf: c-<insert param="id" from_template="filesystem"/> <insert param="base-clone"/>
+
+
+</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/sap-as.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/sap-as.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/sap-as.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/sap-as.xml 2015-04-26 21:56:59.000000000 +0200
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<workflow name="sap-as">
+
+<shortdesc lang="en">SAP ASCS Instance</shortdesc>
+<longdesc lang="en">
+ Configure a SAP ASCS instance including: 1) virtual IP addresses for the SAP ASCS instance 2) a fileystems on shared storage /usr/sap/SID/ASCS##, 3) SAPinstance for ASCS.
+</longdesc>
+
+<parameters>
+ <stepdesc lang="en">
+ The ID specified here is for the SAP ASCS resource group.
+ </stepdesc>
+ <parameter name="id" required="1">
+ <shortdesc lang="en">Group ID</shortdesc>
+ <longdesc lang="en">
+ Unique ID for the SAP ASCS instance resource group in the cluster.
+ </longdesc>
+ <content type="string" default="grp_sap_NA0_sapna0as"/>
+ </parameter>
+</parameters>
+
+<templates>
+ <template name="sap-sapinst-as" type="sapinstance" required="1">
+ <stepdesc lang="en">
+ This is the SAP ASCS instance.
+ </stepdesc>
+ <override name="id" value="rsc_sapinst_NA0_ASCS00_sapna0as"/>
+ <override name="InstanceName" value="NA0_ASCS00_sapna0as"/>
+ <override name="START_PROFILE" value="/usr/sap/NA0/SYS/profile/START_ASCS00_sapna0as"/>
+ </template>
+
+ <template name="sap-virtual-ip-as" type="virtual-ip" required="1">
+ <stepdesc lang="en">
+ The IP address configured here will be for the SAP ASCS instance.
+ </stepdesc>
+ <override name="id" value="rsc_ip_NA0_sapna0as"/>
+ <override name="ip" value="172.17.2.53"/>
+ <override name="netmask" value="24"/>
+ <override name="nic" value="eth0"/>
+ </template>
+
+ <template name="sap-filesystem-sapas" type="filesystem" required="1">
+ <stepdesc lang="en">
+ This filesystem is for the /usr/sap/SID/ASCS## directory.
+
+ If a filesystem 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.
+ </stepdesc>
+ <override name="id" value="rsc_fs_NA0_sapna0as"/>
+ <override name="directory" value="/usr/sap/NA0/ASCS00"/>
+ <override name="options" value="noatime,barrier=0,data=writeback"/>
+ <override name="operations" value="op stop timeout=300 op monitor interval=30 timeout=130"/>
+ </template>
+</templates>
+
+
+group <insert param="id" />
+ <insert param="id" from_template="sap-virtual-ip-as"/>
+ <insert param="id" from_template="sap-filesystem-sapas"/>
+ <insert param="id" from_template="sap-sapinst-as"/>
+ meta target-role=stopped
+
+
+</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/sap-ci.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/sap-ci.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/sap-ci.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/sap-ci.xml 2015-04-26 21:56:59.000000000 +0200
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<workflow name="sap-ci">
+
+<shortdesc lang="en">SAP Central Instance</shortdesc>
+<longdesc lang="en">
+ Configure a SAP Central Instance including: 1) virtual IP addresses for the SAP ASCS instance 2) a fileystems on shared storage /usr/sap/SID/DVEBMGS##, 3) SAPinstance for the Central Instance.
+</longdesc>
+
+<parameters>
+ <stepdesc lang="en">
+ The ID specified here is for the SAP Central Instance resource group.
+ </stepdesc>
+ <parameter name="id" required="1">
+ <shortdesc lang="en">Group ID</shortdesc>
+ <longdesc lang="en">
+ Unique ID for the SAP Central Instance resource group in the cluster.
+ </longdesc>
+ <content type="string" default="grp_sap_NA0_sapna0ci"/>
+ </parameter>
+</parameters>
+
+<templates>
+ <template name="sap-sapinst-ci" type="sapinstance" required="1">
+ <stepdesc lang="en">
+ This is the SAP Central instance.
+ </stepdesc>
+ <override name="id" value="rsc_sapinst_NA0_DVEBMGS01_sapna0ci"/>
+ <override name="InstanceName" value="NA0_DVEBMGS01_sapna0ci"/>
+ <override name="START_PROFILE" value="/usr/sap/NA0/SYS/profile/START_DVEBMGS01_sapna0ci"/>
+ </template>
+
+ <template name="sap-virtual-ip-ci" type="virtual-ip" required="1">
+ <stepdesc lang="en">
+ The IP address configured here will be for the SAP Central Instance.
+ </stepdesc>
+ <override name="id" value="rsc_ip_NA0_sapna0ci"/>
+ <override name="ip" value="172.17.2.55"/>
+ <override name="netmask" value="24"/>
+ <override name="nic" value="eth0"/>
+ </template>
+
+ <template name="sap-filesystem-sapci" type="filesystem" required="1">
+ <stepdesc lang="en">
+ This filesystem is for the /usr/sap/SID/DVEBMGS## directory.
+
+ If a filesystem 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.
+ </stepdesc>
+ <override name="id" value="rsc_fs_NA0_sapna0ci"/>
+ <override name="directory" value="/usr/sap/NA0/DVEBMGS01"/>
+ <override name="options" value="noatime,barrier=0,data=writeback"/>
+ <override name="operations" value="op stop timeout=300 op monitor interval=30 timeout=130"/>
+ </template>
+</templates>
+
+
+group <insert param="id" />
+ <insert param="id" from_template="sap-virtual-ip-ci"/>
+ <insert param="id" from_template="sap-filesystem-sapci"/>
+ <insert param="id" from_template="sap-sapinst-ci"/>
+ meta target-role=stopped
+
+
+</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/sap-db.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/sap-db.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/sap-db.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/sap-db.xml 2015-04-26 21:56:59.000000000 +0200
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<workflow name="sap-db">
+
+<shortdesc lang="en">SAP Database Instance</shortdesc>
+<longdesc lang="en">
+ Configure a SAP database instance including: 1) virtual IP addresses for the SAP database instance 2) a fileystems on shared storage /sapdb, 3) SAPinstance for the database.
+</longdesc>
+
+<parameters>
+ <stepdesc lang="en">
+ The ID specified here is for the SAP Database instance resource group.
+ </stepdesc>
+ <parameter name="id" required="1">
+ <shortdesc lang="en">Group ID</shortdesc>
+ <longdesc lang="en">
+ Unique ID for the SAP Database instance resource group in the cluster.
+ </longdesc>
+ <content type="string" default="grp_sapdb_NA0"/>
+ </parameter>
+</parameters>
+
+<templates>
+ <template name="sapdb" required="1">
+ <stepdesc lang="en">
+ This is the SAP Database instance.
+ </stepdesc>
+ </template>
+
+ <template name="sap-virtual-ip-db" type="virtual-ip" required="1">
+ <stepdesc lang="en">
+ The IP address configured here will be for the SAP Database instance.
+ </stepdesc>
+ <override name="id" value="rsc_ip_NA0_sapna0db"/>
+ <override name="ip" value="172.17.2.54"/>
+ <override name="netmask" value="24"/>
+ <override name="nic" value="eth0"/>
+ </template>
+
+ <template name="sap-filesystem-sapdb" type="filesystem" required="1">
+ <stepdesc lang="en">
+ This filesystem is for the SAP database
+ (typically mounted on /sapdb).
+
+ If a filesystem 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.
+ </stepdesc>
+ <override name="id" value="rsc_fs_NA0_sapdb"/>
+ <override name="directory" value="/sapdb"/>
+ <override name="options" value="noatime,barrier=0,data=writeback"/>
+ <override name="operations" value="op stop timeout=300 op monitor interval=30 timeout=130"/>
+ </template>
+</templates>
+
+
+group <insert param="id" />
+ <insert param="id" from_template="sap-virtual-ip-db"/>
+ <insert param="id" from_template="sap-filesystem-sapdb"/>
+ <insert param="id" from_template="sapdb"/>
+ meta target-role=stopped
+
+
+</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/virtual-ip.xml new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/virtual-ip.xml
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/config/wizard/workflows/virtual-ip.xml 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/config/wizard/workflows/virtual-ip.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<workflow name="virtual-ip">
-<shortdesc lang="en">Virtual IP</shortdesc>
-<longdesc lang="en">
-Create a virtual IP resource.
-</longdesc>
-<templates>
-<template name="virtual-ip" required="1">
-<stepdesc lang="en">
-Configure the virtual IP.
-</stepdesc>
-</template>
-</templates>
-
-
-</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.7.0+git.1427954675.b847dc9/hawk/lib/util.rb new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/lib/util.rb
--- old/hawk-0.7.0+git.1427954675.b847dc9/hawk/lib/util.rb 2015-04-02 08:05:08.000000000 +0200
+++ new/hawk-0.7.0+git.1430078135.9e13c3c/hawk/lib/util.rb 2015-04-26 21:56:59.000000000 +0200
@@ -304,6 +304,12 @@
PerRequestCache.fetch(:has_acl_support) {
%x[/usr/sbin/cibadmin -!].split(/\s+/).include?("acls")
}
+ when :tags
+ PerRequestCache.fetch(:has_tags) {
+ # TODO: fix this
+ %x[/usr/sbin/cibadmin -Ql -A /cib/configuration/tags >/dev/null 2>&1]
+ $?.exitstatus == 0
+ }
else
false
end