From 6410d713e0aa443f4d1720d466c8a425134cd650 Mon Sep 17 00:00:00 2001
From: Lester Wade <lestertron@gmail.com>
Date: Thu, 25 Oct 2012 18:37:49 +0100
Subject: [PATCH] Slightly streamline DRBD config process and provide details
 on skipping initial sync. Edit README too.

---
 README                                 |  2 +-
 content/en_us/ig/config_drbd.dita      |  5 +++--
 content/en_us/ig/config_drbd_sync.dita | 29 ++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 content/en_us/ig/config_drbd_sync.dita

diff --git a/README b/README
index 1d299136..2059a341 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ the following tasks:
 
   * Make sure that you have Java and ANT.
 
-  * Create environment variables for DOC_HOME (path to the euca/content/en_us directory
+  * Create environment variables for DOC_HOME (path to the euca/content/ directory
     is), DITA_HOME (path to the euca/tools/DITA-OT directory), JAVA_HOME, and
     ANT_HOME.
 
diff --git a/content/en_us/ig/config_drbd.dita b/content/en_us/ig/config_drbd.dita
index 8b4230f1..ae3a8db4 100644
--- a/content/en_us/ig/config_drbd.dita
+++ b/content/en_us/ig/config_drbd.dita
@@ -153,8 +153,7 @@ include "/etc/eucalyptus/drbd.conf";</codeblock>
         			partition allocated for Walrus (<filepath>/dev/sdb1</filepath>).</cmd>
         		<info>
         			<codeblock>drbdmeta --force /dev/drbd1 v08 /dev/sdb1 internal create-md
-drbdadm attach r0
-drbdadm connect r0</codeblock>
+drbdadm up r0</codeblock>
 				<note type="important">Repeat this step on the secondary Walrus.</note>
         		</info>
         	</step>
@@ -199,3 +198,5 @@ euca-modify-property -p walrus.resource=r0</codeblock>
 		</taskbody>
 
 </task>
+
+
diff --git a/content/en_us/ig/config_drbd_sync.dita b/content/en_us/ig/config_drbd_sync.dita
new file mode 100644
index 00000000..582d4c5b
--- /dev/null
+++ b/content/en_us/ig/config_drbd_sync.dita
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This work by Eucalyptus Systems is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. See the accompanying LICENSE file for more information.-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<task outputclass="docs one-sidebar sidebar-first" id="config_drbd">
+    <title>Skipping Initial Device Synchronisation</title>
+    <shortdesc/>
+    <taskbody>
+            <context>
+                    <note type="restriction">Only perform these steps if you have no existing data on your DRBD devices. It is assumed you have completed step 11 in the DRBD configuration section.</note>
+            </context>
+            <steps>
+                    <step>
+                            <cmd>Before promoting the DRBD resource to primary, generate a new UUID and clear the bitmap on the primary Walrus ONLY.</cmd>
+                            <info>
+                                    <codeblock>drbdadm -- --clear-bitmap new-current-uuid r0</codeblock>
+                            </info>
+                    </step>
+                    <step>
+                            <cmd>On the same Walrus, promote the resource to primary:</cmd>
+                            <info>
+                                    <codeblock>drbdadm primary r0</codeblock>
+                            </info>
+                    </step>
+                    <step>
+                            <cmd>Resume the configuration at Step 13 of the previous section</cmd>
+                    </step>
+            </steps>
+        </taskbody>
+</task>