diff --git a/xml/options-1.0.rng b/xml/options-1.0.rng index 3ed8051842..b9e7ffea0a 100644 --- a/xml/options-1.0.rng +++ b/xml/options-1.0.rng @@ -1,34 +1,34 @@ - diff --git a/xml/options-3.0.rng b/xml/options-3.0.rng new file mode 100644 index 0000000000..332f4096c2 --- /dev/null +++ b/xml/options-3.0.rng @@ -0,0 +1,103 @@ + + + + + + + + + + + + cluster-infrastructure + + + + + + heartbeat + openais + classic openais + classic openais (with plugin) + cman + + + + + + + + + + + cluster-infrastructure + cluster_recheck_interval + dc_deadtime + default-migration-threshold + default_migration_threshold + election_timeout + expected-quorum-votes + no_quorum_policy + notification-agent + notification-recipient + remove_after_stop + shutdown_escalation + startup_fencing + stonith_action + stonith_enabled + stop_orphan_actions + stop_orphan_resources + symmetric_cluster + transition_idle_timeout + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/test-2/030-clu-props-plain-rename.ref b/xml/test-2/030-clu-props-plain-rename.ref new file mode 100644 index 0000000000..2f446c3fd1 --- /dev/null +++ b/xml/test-2/030-clu-props-plain-rename.ref @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/test-2/030-clu-props-plain-rename.ref.err b/xml/test-2/030-clu-props-plain-rename.ref.err new file mode 100644 index 0000000000..32306f9f53 --- /dev/null +++ b/xml/test-2/030-clu-props-plain-rename.ref.err @@ -0,0 +1,13 @@ +Cluster properties: cluster-opts-cluster_recheck_interval: renaming cluster_recheck_interval as cluster-recheck-interval +Cluster properties: cluster-opts-dc_deadtime: renaming dc_deadtime as dc-deadtime +Cluster properties: cluster-opts-election_timeout: renaming election_timeout as election-timeout +Cluster properties: cluster-opts-no_quorum_policy: renaming no_quorum_policy as no-quorum-policy +Cluster properties: cluster-opts-remove_after_stop: renaming remove_after_stop as remove-after-stop +Cluster properties: cluster-opts-shutdown_escalation: renaming shutdown_escalation as shutdown-escalation +Cluster properties: cluster-opts-startup_fencing: renaming startup_fencing as startup-fencing +Cluster properties: cluster-opts-stonith_action: renaming stonith_action as stonith-action +Cluster properties: cluster-opts-stonith_enabled: renaming stonith_enabled as stonith-enabled +Cluster properties: cluster-opts-stop_orphan_actions: renaming stop_orphan_actions as stop-orphan-actions +Cluster properties: cluster-opts-stop_orphan_resources: renaming stop_orphan_resources as stop-orphan-resources +Cluster properties: cluster-opts-symmetric_cluster: renaming symmetric_cluster as symmetric-cluster +Cluster properties: cluster-opts-transition_idle_timeout: renaming transition_idle_timeout as cluster-delay diff --git a/xml/test-2/030-clu-props-plain-rename.xml b/xml/test-2/030-clu-props-plain-rename.xml new file mode 100644 index 0000000000..8186117d20 --- /dev/null +++ b/xml/test-2/030-clu-props-plain-rename.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/test-2/031-clu-props-drop.ref b/xml/test-2/031-clu-props-drop.ref new file mode 100644 index 0000000000..03e5618e22 --- /dev/null +++ b/xml/test-2/031-clu-props-drop.ref @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/xml/test-2/031-clu-props-drop.ref.err b/xml/test-2/031-clu-props-drop.ref.err new file mode 100644 index 0000000000..ca172ef2db --- /dev/null +++ b/xml/test-2/031-clu-props-drop.ref.err @@ -0,0 +1,10 @@ +Cluster properties: cluster-opts-cluster-infrastructure: dropping cluster-infrastructure for matching heartbeat|openais|classic openais|classic openais (with plugin)|cman +Cluster properties: ... corosync (2+) infrastructure can be used instead, though the value is not of significance +Cluster properties: cluster-opts-default-migration-threshold: dropping default-migration-threshold +Cluster properties: ... migration-threshold in rsc_defaults can be configured instead +Cluster properties: cluster-opts-default_migration_threshold: dropping default_migration_threshold +Cluster properties: ... migration-threshold in rsc_defaults can be configured instead +Cluster properties: cluster-opts-expected-quorum-votes: dropping expected-quorum-votes +Cluster properties: ... corosync (2+) infrastructure tracks quorum on its own +Cluster properties: cluster-opts-notification-agent: dropping notification-agent +Cluster properties: ... standalone alerts can be configured instead diff --git a/xml/test-2/031-clu-props-drop.xml b/xml/test-2/031-clu-props-drop.xml new file mode 100644 index 0000000000..9d33788a1c --- /dev/null +++ b/xml/test-2/031-clu-props-drop.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl index f4c083eff1..4333551a94 100644 --- a/xml/upgrade-2.10.xsl +++ b/xml/upgrade-2.10.xsl @@ -1,845 +1,1067 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +