vcl-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r845586 [1/2] - in /websites/staging/vcl/trunk/content: ./ confluence_export/
Date Tue, 08 Jan 2013 20:52:52 GMT
Author: buildbot
Date: Tue Jan  8 20:52:52 2013
New Revision: 845586

Log:
Staging update by buildbot for vcl

Added:
    websites/staging/vcl/trunk/content/confluence_export/2.2-phpmyadmin-installation-configuration.html
    websites/staging/vcl/trunk/content/confluence_export/adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-unofficial.html
Modified:
    websites/staging/vcl/trunk/content/   (props changed)
    websites/staging/vcl/trunk/content/confluence_export/2.2-database-configuration.html
    websites/staging/vcl/trunk/content/confluence_export/2.2-management-node-installation.html
    websites/staging/vcl/trunk/content/confluence_export/2.2-web-code-installation.html
    websites/staging/vcl/trunk/content/confluence_export/adding-ldap-authentication.html
    websites/staging/vcl/trunk/content/confluence_export/further-steps-if-using-only-vmware.html
    websites/staging/vcl/trunk/content/confluence_export/further-steps-if-using-xcat.html
    websites/staging/vcl/trunk/content/confluence_export/missing_from_export.html
    websites/staging/vcl/trunk/content/confluence_export/upgrade-from-previous-version.html
    websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.html

Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan  8 20:52:52 2013
@@ -1 +1 @@
-1430503
+1430520

Modified: websites/staging/vcl/trunk/content/confluence_export/2.2-database-configuration.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/2.2-database-configuration.html (original)
+++ websites/staging/vcl/trunk/content/confluence_export/2.2-database-configuration.html Tue Jan  8 20:52:52 2013
@@ -78,17 +78,20 @@
   
   <div id="content">
     <h1 class="title">2.2 Database Configuration</h1>
-    <p>{excerpt}This page describes how to create the VCL MySQL database and
-import the VCL database schema.{excerpt}</p>
+    <p>This page describes how to create the VCL MySQL database and
+import the VCL database schema.</p>
 <p><a name="2.2DatabaseConfiguration-*Prerequisites*"></a></p>
-<h2 id="prerequisites"><em>Prerequisites</em></h2>
+<h2 id="prerequisites">Prerequisites</h2>
 <ol>
 <li>
 <p>You should have mysql server 5.x installed.&nbsp;If mysql server is not
 installed:</p>
-<p>yum install mysql-server -y
-/sbin/chkconfig --level 345 mysqld on
-/sbin/service mysqld start</p>
+<div class="codehilite"><pre><span class="n">yum</span> <span class="n">install</span> <span class="n">mysql</span><span class="o">-</span><span class="n">server</span> <span class="o">-</span><span class="n">y</span>
+<span class="sr">/sbin/c</span><span class="n">hkconfig</span> <span class="o">--</span><span class="n">level</span> <span class="mi">345</span> <span class="n">mysqld</span> <span class="n">on</span>
+<span class="sr">/sbin/s</span><span class="n">ervice</span> <span class="n">mysqld</span> <span class="n">start</span>
+</pre></div>
+
+
 </li>
 <li>
 <p>Your host based firewall (IPTables) should be configured to allow traffic
@@ -97,7 +100,7 @@ from the web server and management serve
 </li>
 </ol>
 <p><a name="2.2DatabaseConfiguration-*SettingUptheDatabaseforVCL*"></a></p>
-<h2 id="setting-up-the-database-for-vcl"><em>Setting Up the Database for VCL</em></h2>
+<h2 id="setting-up-the-database-for-vcl">Setting Up the Database for VCL</h2>
 <ol>
 <li>
 <p>start the mysql command line client by running </p>

Modified: websites/staging/vcl/trunk/content/confluence_export/2.2-management-node-installation.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/2.2-management-node-installation.html (original)
+++ websites/staging/vcl/trunk/content/confluence_export/2.2-management-node-installation.html Tue Jan  8 20:52:52 2013
@@ -78,7 +78,419 @@
   
   <div id="content">
     <h1 class="title">2.2 Management Node Installation</h1>
-    
+    <p>This page describes how to install and configure the backend VCL
+management node components including the required Perl modules, VCL daemon
+(vcld), and Windows utility dependencies.</p>
+<p><a name="2.2ManagementNodeInstallation-Assumptions"></a></p>
+<h2 id="assumptions">Assumptions</h2>
+<p>The following instructions assume the VCL <a href="2.2-database-configuration.html">database has been installed and configured</a>
+ and that the management node information has been added to the database as
+described on the <a href="2.2-web-code-installation.html">web code installation page</a>
+. This also assumes that the perl-DBD-MySQL-3.x and the mysql client
+(mysql-5.x) packages are installed, for database communications.</p>
+<p><a name="2.2ManagementNodeInstallation-InstallingVCLManagementNodeCode-PerlDaemon"></a></p>
+<h2 id="installing-vcl-management-node-code-perl-daemon">Installing VCL Management Node Code - Perl Daemon</h2>
+<ol>
+<li>If you haven't already done so, download and extract a copy of the latest
+release. There is a link to it on our <a href="/downloads/download.cgi">download page</a>
+.</li>
+<li>
+<p>copy the "managementnode" directory to a location, typically /usr/local</p>
+<p>cp -r managementnode /usr/local/vcl</p>
+</li>
+</ol>
+<p><a name="2.2ManagementNodeInstallation-InstallRequiredPackages"></a></p>
+<h2 id="install-required-packages">Install Required Packages</h2>
+<p>The following packages to be installed on the OS before installing the
+required Perl modules.&nbsp; These packages must be installed if they were
+not installed as part of your base Linux install.&nbsp; It is easiest to
+use the package management utility for your OS --- yum, rpm, or other.</p>
+<ul>
+<li>expat</li>
+<li>expat-devel</li>
+<li>gcc</li>
+<li>krb5-libs</li>
+<li>krb5-devel</li>
+<li>libxml2</li>
+<li>libxml2-devel</li>
+<li>nmap</li>
+<li>openssl</li>
+<li>openssl-devel</li>
+<li>perl-DBD-MySQL</li>
+<li>xmlsec1-openssl</li>
+</ul>
+<p>To install these packages using yum:</p>
+<div class="codehilite"><pre><span class="n">yum</span> <span class="n">install</span> <span class="n">expat</span> <span class="n">expat</span><span class="o">-</span><span class="n">devel</span> <span class="n">gcc</span> <span class="n">krb5</span><span class="o">-</span><span class="n">libs</span> <span class="n">krb5</span><span class="o">-</span><span class="n">devel</span> <span class="n">libxml2</span> <span class="n">libxml2</span><span class="o">-</span><span class="n">devel</span> <span class="n">openssl</span> <span class="n">openssl</span><span class="o">-</span><span class="n">devel</span> <span class="n">perl</span><span class="o">-</span><span class="n">DBD</span><span class="o">-</span><span class="n">MySQL</span> <span class="n">xmlsec1</span><span class="o">-</span><span class="n">openssl</span> <span class="n">nmap</span> <span class="o">-</span><span class="n">y</span>
+</pre></div>
+
+
+<p><a name="2.2ManagementNodeInstallation-InstallRequiredPerlModules"></a></p>
+<h2 id="install-required-perl-modules">Install Required Perl Modules</h2>
+<p>The VCL Perl code running on the management node requires additional Perl
+modules in order to run. These Perl modules are available from <a href="http://cpan.org/">CPAN - The Comprehensive Perl Archive Network</a>
+. A search engine for CPAN modules is available at <a href="http://search.cpan.org/">search.cpan.org</a>
+.  The Perl modules are licensed under the <a href="http://dev.perl.org/licenses/artistic.html">Artistic</a>
+ and <a href="http://www.opensource.org/licenses/gpl-license.php">GPL</a>
+ licenses.</p>
+<ul>
+<li><a href="http://search.cpan.org/dist/Class-Data-Inheritable/">Class-Data-Inheritable</a></li>
+<li><a href="http://search.cpan.org/dist/Compress-Raw-Zlib/">Compress-Raw-Zlib</a></li>
+<li><a href="http://search.cpan.org/dist/Crypt-SSLeay/">Crypt-SSLeay</a></li>
+<li><a href="http://search.cpan.org/dist/DBI/">DBI</a></li>
+<li><a href="http://search.cpan.org/dist/Devel-StackTrace/">Devel-StackTrace</a></li>
+<li><a href="http://search.cpan.org/dist/Digest-SHA1/">Digest-SHA1</a></li>
+<li><a href="http://search.cpan.org/dist/Exception-Class/">Exception-Class</a></li>
+<li><a href="http://search.cpan.org/dist/HTML-Parser/">HTML-Parser</a></li>
+<li><a href="http://search.cpan.org/dist/IO-Compress/">IO-Compress</a></li>
+<li><a href="http://search.cpan.org/dist/libwww-perl/">libwww-perl</a></li>
+<li><a href="http://search.cpan.org/dist/MailTools/">MailTools</a></li>
+<li><a href="http://search.cpan.org/dist/Object-InsideOut/">Object-InsideOut</a></li>
+<li><a href="http://search.cpan.org/dist/RPC-XML/">RPC-XML</a></li>
+<li><a href="http://search.cpan.org/dist/XML-Parser/">XML-Parser</a></li>
+<li><a href="http://search.cpan.org/dist/YAML/">YAML</a></li>
+</ul>
+<p><a name="2.2ManagementNodeInstallation-Runinstall_perl_libs.plScript"></a></p>
+<h4 id="run-install_perl_libspl-script">Run install_perl_libs.pl Script</h4>
+<p>A script is provided in the managementnode/bin directory called
+<em>install_perl_libs.pl</em> which will attempt to download and install the
+required perl libraries.&nbsp; Run the script:</p>
+<div class="codehilite"><pre><span class="n">perl</span> <span class="sr">/usr/</span><span class="nb">local</span><span class="sr">/vcl/</span><span class="n">bin</span><span class="o">/</span><span class="n">install_perl_libs</span><span class="o">.</span><span class="n">pl</span>
+</pre></div>
+
+
+<p>The script will hang or terminate if it encounters a problem.  If this occurs, manually run the last command the script attempted.  The command should be listed in the output.  You will need to troubleshoot the problem.  The most likely cause of the problem is a missing Linux package.  Make sure the required packages are installed.</p>
+<p><a name="2.2ManagementNodeInstallation-HowtoTestifRequiredPerlModulesareInstalled"></a></p>
+<h4 id="how-to-test-if-required-perl-modules-are-installed">How to Test if Required Perl Modules are Installed</h4>
+<p>Run the following command to execute the utils.pm file:</p>
+<div class="codehilite"><pre><span class="n">perl</span> <span class="sr">/usr/</span><span class="nb">local</span><span class="sr">/vcl/</span><span class="n">lib</span><span class="sr">/VCL/</span><span class="n">utils</span><span class="o">.</span><span class="n">pm</span>
+</pre></div>
+
+
+<p>Executing utils.pm does not actually do anything but this will tell you if
+VCL will be able to run.&nbsp; If any Perl modules are missing you will see
+"Can't locate" lines:</p>
+<div class="codehilite"><pre><span class="n">Can</span><span class="err">&#39;</span><span class="n">t</span> <span class="n">locate</span> <span class="n">HTTP</span><span class="o">/</span><span class="n">Headers</span><span class="o">.</span><span class="n">pm</span> <span class="n">in</span> <span class="nv">@INC</span> <span class="p">(</span><span class="nv">@INC</span> <span class="n">contains:</span><span class="o">...</span><span class="p">)</span>
+</pre></div>
+
+
+<p>Once all of the required modules are installed, you should see output similar to the following:</p>
+<div class="codehilite"><pre><span class="n">BIN</span> <span class="n">PATH:</span> <span class="sr">/usr/</span><span class="nb">local</span><span class="sr">/vcl/</span><span class="n">lib</span><span class="o">/</span><span class="n">VCL</span>
+<span class="n">pre</span><span class="o">-</span><span class="n">execution:</span> <span class="n">config</span> <span class="n">file</span> <span class="n">being</span> <span class="n">used:</span> <span class="sr">/etc/</span><span class="n">vcl</span><span class="o">/</span><span class="n">vcld</span><span class="o">.</span><span class="n">conf</span>
+<span class="n">Uncaught</span> <span class="n">exception</span> <span class="n">from</span> <span class="n">user</span> <span class="n">code:</span>
+        <span class="n">VCLD</span> <span class="p">:</span> <span class="sr">/etc/</span><span class="n">vcl</span><span class="o">/</span><span class="n">vcld</span><span class="o">.</span><span class="n">conf</span> <span class="n">does</span> <span class="ow">not</span> <span class="n">exist</span><span class="p">,</span> <span class="n">exiting</span> <span class="o">--</span> <span class="n">No</span> <span class="n">such</span> <span class="n">file</span> <span class="ow">or</span> <span class="n">directory</span>
+<span class="k">BEGIN</span> <span class="n">failed</span><span class="o">--</span><span class="n">compilation</span> <span class="n">aborted</span> <span class="n">at</span> <span class="sr">/usr/</span><span class="nb">local</span><span class="sr">/vcl/</span><span class="n">lib</span><span class="sr">/VCL/</span><span class="n">utils</span><span class="o">.</span><span class="n">pm</span> <span class="n">line</span> <span class="mi">616</span><span class="o">.</span>
+<span class="n">at</span> <span class="sr">/usr/</span><span class="nb">local</span><span class="sr">/vcl/</span><span class="n">lib</span><span class="sr">/VCL/</span><span class="n">utils</span><span class="o">.</span><span class="n">pm</span> <span class="n">line</span> <span class="mi">616</span>
+</pre></div>
+
+
+<p><a name="2.2ManagementNodeInstallation-WhattodoifaModuleisMissing"></a></p>
+<h4 id="what-to-do-if-a-module-is-missing">What to do if a Module is Missing</h4>
+<ol>
+<li>Determine the name of the missing module by looking at the "Can't locate"
+line</li>
+<li>Search for the missing module on search.cpan.org and install it manually</li>
+</ol>
+<p><a name="2.2ManagementNodeInstallation-HowtoInstallaPerl&nbsp;ModuleManually"></a></p>
+<h4 id="how-to-install-a-perlwzxhzdk35module-manually">How to Install a Perl&nbsp;Module Manually</h4>
+<ol>
+<li>
+<p>Change directories to /tmp:</p>
+<p><strong>cd /tmp</strong></p>
+</li>
+<li>
+<p>Download the module's source package using wget:</p>
+<p><strong>wget <a href="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.827.tar.gz">http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.827.tar.gz</a></strong></p>
+</li>
+<li>
+<p>Unpack the source package using tar:</p>
+<p><strong>tar xzf libwww-perl-5.827.tar.gz</strong></p>
+</li>
+<li>
+<p>The previous command should have created a libwww-perl-5.827 directory,
+change to this directory:</p>
+<p><strong>cd libwww-perl-5.827</strong></p>
+</li>
+<li>
+<p>Create a makefile with the following command:</p>
+<p><strong>perl Makefile.PL</strong></p>
+</li>
+<li>
+<p>Compile the module:</p>
+<p><strong>make</strong></p>
+</li>
+<li>
+<p>Test the module:</p>
+<p><strong>make test</strong></p>
+</li>
+<li>
+<p>Install the module:</p>
+<p><strong>make install</strong></p>
+</li>
+</ol>
+<p>The last line you should see should be:</p>
+<div class="codehilite"><pre><span class="sr">/usr/</span><span class="n">bin</span><span class="o">/</span><span class="n">make</span> <span class="n">install</span>  <span class="o">--</span> <span class="n">OK</span>
+</pre></div>
+
+
+<p><a name="2.2ManagementNodeInstallation-HowtoInstallaPerlModuleUsingCPAN"></a></p>
+<h4 id="how-to-install-a-perl-module-using-cpan">How to Install a Perl Module Using CPAN</h4>
+<ol>
+<li>
+<p>Enter the CPAN shell:</p>
+<p><strong>perl -MCPAN -e shell</strong></p>
+</li>
+<li>
+<p>You will need to configure CPAN if it's the first time it is being run.
+Enter <strong>No</strong> at the first prompt to auto-configure the CPAN module.</p>
+</li>
+<li>
+<p>Search for a module using the "m" command:</p>
+<p><strong>m /Zlib/</strong></p>
+<p>You should find the module you were looking for on a line like this:</p>
+<div class="codehilite"><pre>
+</pre></div>
+
+
+</li>
+<li>
+<p>Install the module:</p>
+<p><strong>install Compress::Zlib</strong></p>
+</li>
+<li>
+<p>Answer <strong>yes</strong> if asked to install any prerequisite modules
+The last line you should see should be:</p>
+<p>/usr/bin/make install  -- OK</p>
+</li>
+</ol>
+<p><a name="2.2ManagementNodeInstallation-Configurevcld.conf"></a></p>
+<h2 id="configure-vcldconf">Configure vcld.conf</h2>
+<ol>
+<li>
+<p>Create the /etc/vcl directory:</p>
+<p><strong>mkdir /etc/vcl</strong></p>
+</li>
+<li>
+<p>Copy the generic vcld.conf file to /etc/vcl:</p>
+<p><strong>cp /usr/local/vcl/etc/vcl/vcld.conf /etc/vcl</strong></p>
+</li>
+<li>
+<p>Edit the /etc/vcl/vcld.conf file:</p>
+<p><strong>vi /etc/vcl/vcld.conf</strong></p>
+<p>The following lines must be configured in order to start the VCL daemon 
+(vcld) and allow it to check in to the database:</p>
+<ul>
+<li>FQDN - the fully qualified name of the management node, this should
+match the name that was configured for the management node in the database</li>
+<li>server - the IP address or FQDN of the database server</li>
+<li>LockerWrtUser - database user account with write privileges</li>
+<li>wrtPass - database user password</li>
+</ul>
+</li>
+<li>
+<p>Save the vcld.conf file</p>
+</li>
+</ol>
+<p><a name="2.2ManagementNodeInstallation-InstalltheVCLDaemon(vcld)&nbsp;Service"></a></p>
+<h2 id="install-the-vcl-daemon-vcldwzxhzdk42service">Install the VCL Daemon (vcld)&nbsp;Service</h2>
+<ol>
+<li>
+<p>Copy the vcld service script to /etc/init.d and name it vcld:</p>
+<p><strong>cp /usr/local/vcl/bin/S99vcld.linux /etc/init.d/vcld</strong></p>
+</li>
+<li>
+<p>Add the vcld service using chkconfig:</p>
+<p><strong>/sbin/chkconfig --add vcld</strong></p>
+</li>
+<li>
+<p>Configure the vcld service to automatically run at runtime levels 3-5:</p>
+<p><strong>/sbin/chkconfig --level 345 vcld on</strong></p>
+</li>
+</ol>
+<p><a name="2.2ManagementNodeInstallation-StartandCheck&nbsp;thevcldService"></a></p>
+<h2 id="start-and-checkwzxhzdk45the-vcld-service">Start and Check&nbsp;the vcld Service</h2>
+<ol>
+<li>
+<p>Start the vcld service:</p>
+<p><strong>/sbin/service vcld start</strong></p>
+<p>You should see output similar to the following:</p>
+<div class="codehilite"><pre><span class="n">Starting</span> <span class="n">vcld</span> <span class="n">daemon:</span> <span class="n">BIN</span> <span class="n">PATH:</span> <span class="sr">/usr/</span><span class="nb">local</span><span class="sr">/vcl/</span><span class="n">bin</span>
+<span class="n">pre</span><span class="o">-</span><span class="n">execution:</span> <span class="n">config</span> <span class="n">file</span> <span class="n">being</span> <span class="n">used:</span> <span class="sr">/etc/</span><span class="n">vcl</span><span class="o">/</span><span class="n">vcld</span><span class="o">.</span><span class="n">conf</span>
+<span class="n">FQDN</span> <span class="n">is</span> <span class="ow">not</span> <span class="n">listed</span>
+<span class="n">pre</span><span class="o">-</span><span class="n">execution:</span> <span class="n">process</span> <span class="n">name</span> <span class="n">is</span> <span class="n">set</span> <span class="n">to:</span> <span class="n">vcld</span>
+<span class="n">pre</span><span class="o">-</span><span class="n">execution:</span> <span class="n">verbose</span> <span class="n">mode</span> <span class="n">is</span> <span class="n">set</span> <span class="n">to:</span> <span class="mi">1</span>
+<span class="n">pre</span><span class="o">-</span><span class="n">execution:</span> <span class="n">testing</span> <span class="n">mode</span> <span class="n">is</span> <span class="n">set</span> <span class="n">to:</span> <span class="mi">0</span>
+<span class="n">pre</span><span class="o">-</span><span class="n">execution:</span> <span class="nb">log</span> <span class="n">file</span> <span class="n">being</span> <span class="n">used:</span> <span class="sr">/var/</span><span class="nb">log</span><span class="o">/</span><span class="n">vcld</span><span class="o">.</span><span class="nb">log</span>
+<span class="n">pre</span><span class="o">-</span><span class="n">execution:</span> <span class="n">PID</span> <span class="n">file</span> <span class="n">being</span> <span class="n">used:</span> <span class="sr">/var/</span><span class="n">run</span><span class="o">/</span><span class="n">vcld</span><span class="o">.</span><span class="n">pid</span>
+<span class="n">Created</span> <span class="n">process</span> <span class="mi">23696</span> <span class="n">renamed</span> <span class="n">to</span> <span class="n">vcld</span> <span class="o">...</span>
+                                                      <span class="p">[</span> <span class="n">OK</span> <span class="p">]</span>
+</pre></div>
+
+
+<p>Note: the vcld service can also be started by running the service script directly:</p>
+<p><strong>/etc/init.d/vcld start</strong></p>
+</li>
+<li>
+<p>Check the vcld service by monitoring the vcld.log file:</p>
+<p><strong>tail -f /var/log/vcld.log</strong></p>
+<p>You should see the following being added to the log file every few seconds
+if the management node is checking in with the database:</p>
+<div class="codehilite"><pre><span class="mi">2009</span><span class="o">-</span><span class="mo">06</span><span class="o">-</span><span class="mi">16</span> <span class="mi">16</span><span class="p">:</span><span class="mi">57</span><span class="p">:</span><span class="mi">15</span><span class="o">|</span><span class="mi">15792</span><span class="o">|</span><span class="n">vcld:main</span><span class="p">(</span><span class="mi">165</span><span class="p">)</span><span class="o">|</span><span class="n">lastcheckin</span> <span class="nb">time</span> <span class="n">updated</span> <span class="k">for</span> <span class="n">management</span> <span class="n">node</span> <span class="mi">18</span><span class="p">:</span> <span class="mi">2009</span><span class="o">-</span><span class="mo">06</span><span class="o">-</span><span class="mi">16</span> <span class="mi">16</span><span class="p">:</span><span class="mi">57</span><span class="p">:</span><span class="mi">15</span>
+</pre></div>
+
+
+</li>
+</ol>
+<p><a name="2.2ManagementNodeInstallation-ConfiguretheSSHClient"></a></p>
+<h3 id="configure-the-ssh-client">Configure the SSH Client</h3>
+<p>To insure that the management node can SSH into your virtual machines
+without problems, you will need to edit the SSH client config for the root
+user:</p>
+<div class="codehilite"><pre><span class="n">vi</span> <span class="sr">/root/</span><span class="o">.</span><span class="n">ssh</span><span class="o">/</span><span class="n">config</span>
+</pre></div>
+
+
+<p>Add the following lines to the top of the configuration file.</p>
+<div class="codehilite"><pre><span class="n">Host</span> <span class="sr">&lt;vmhost&gt;</span> <span class="o">&lt;</span><span class="n">vmhost</span> <span class="n">ip</span><span class="o">&gt;</span>
+   <span class="n">UserKnownHostsFile</span> <span class="sr">/dev/</span><span class="n">null</span>
+   <span class="n">StrictHostKeyChecking</span> <span class="nb">no</span>
+</pre></div>
+
+
+<p>Where:</p>
+<ul>
+<li>
+<p>&lt;vmhost&gt; - Is a wildcard reference to the hostnames for your virtual
+machines.</p>
+<ul>
+<li>For example, if your VM hostnames look like: vmhost1, vmhost2,
+vmhost3.... then replace <vmhost> with "vmhost*"</li>
+</ul>
+</li>
+<li>
+<p>&lt;vmhost ip&gt; - Is a wildcard IP reference to the IPs used by your virtual
+machines.</p>
+<ul>
+<li>For example, if your VMs all have IP addresses starting with 10.0.0,
+then replace <vmhost ip> with "10.0.0.*"</li>
+</ul>
+</li>
+</ul>
+<p>This will insure that new VM hosts will not hang on the known hosts prompts
+when the management node attempts to connect to them for the first time.</p>
+<p><a name="2.2ManagementNodeInstallation-DownloadRequiredUtilities&Drivers"></a></p>
+<h2 id="download-required-utilities-drivers">Download Required Utilities &amp; Drivers</h2>
+<p><a name="2.2ManagementNodeInstallation-WindowsXPandServer2003DeploymentTools(Sysprep)"></a></p>
+<h4 id="windows-xp-and-server-2003-deployment-tools-sysprep">Windows XP and Server 2003 Deployment Tools (Sysprep)</h4>
+<p>The Windows XP and Server 2003 Deployment Tools are available for free from
+Microsoft and are required in order for the capture of Windows XP and
+Server 2003 VCL images to work.&nbsp; The Sysprep utility is included in
+the Deployment Tools.&nbsp; You do not need to download Sysprep for Windows
+7 or Windows Server 2008 because it is included in the operating system.</p>
+<p>Download: <a href="http://www.microsoft.com/downloads/details.aspx?FamilyID=673a1019-8e3e-4be0-ac31-70dd21b5afa7&amp;displaylang=en">Windows XP Service Pack 3 Deployment Tools</a></p>
+<p>Download: <a href="http://www.microsoft.com/downloads/details.aspx?familyid=93F20BB1-97AA-4356-8B43-9584B7E72556&amp;displaylang=en">System Preparation tool for Windows Server 2003 Service Pack 2 Deployment</a></p>
+<p>The Sysprep files need to be extracted from the file you download which is
+in Microsoft's .cab format.&nbsp; It is easiest to extract the files on a
+Windows computer.&nbsp; Windows Explorer is able to open the .cab file and
+then the files contained within can be copied elsewhere.&nbsp; There are
+also some Linux utilities which claim to be able to extract .cab files.</p>
+<p>Copy the extracted Windows XP Sysprep files to the following directory on
+the management node after they have been extracted:</p>
+<div class="codehilite"><pre><span class="sr">/usr/</span><span class="nb">local</span><span class="sr">/vcl/</span><span class="n">tools</span><span class="sr">/Windows_XP/</span><span class="n">Utilities</span><span class="o">/</span><span class="n">Sysprep</span>
+</pre></div>
+
+
+<p>Copy the extracted Windows Server 2003 Sysprep files to the
+following directory on the management node after they have been extracted:</p>
+<div class="codehilite"><pre><span class="sr">/usr/</span><span class="nb">local</span><span class="sr">/vcl/</span><span class="n">tools</span><span class="sr">/Windows_Server_2003/</span><span class="n">Utilities</span><span class="o">/</span><span class="n">Sysprep</span>
+</pre></div>
+
+
+<p>The Sysprep directories should already exist on the management node because
+they exist the Subversion repository.&nbsp; The Sysprep directories should
+contain the following files at a minimum:</p>
+<div class="codehilite"><pre><span class="o">-</span><span class="n">rw</span><span class="o">-</span><span class="n">rw</span><span class="o">-</span><span class="n">r</span><span class="o">-</span> <span class="mi">1</span> <span class="n">root</span> <span class="n">root</span> <span class="mi">25600</span> <span class="n">Aug</span> <span class="mi">18</span> <span class="mi">17</span><span class="p">:</span><span class="mi">32</span> <span class="n">setupcl</span><span class="o">.</span><span class="n">exe</span>
+<span class="o">-</span><span class="n">rw</span><span class="o">-</span><span class="n">rw</span><span class="o">-</span><span class="n">r</span><span class="o">-</span> <span class="mi">1</span> <span class="n">root</span> <span class="n">root</span> <span class="mi">88576</span> <span class="n">Aug</span> <span class="mi">18</span> <span class="mi">17</span><span class="p">:</span><span class="mi">32</span> <span class="n">sysprep</span><span class="o">.</span><span class="n">exe</span>
+</pre></div>
+
+
+<p>Your Windows product keys and/or KMS server addresses need to be entered
+into the VCL database in order to capture a Windows image using
+Sysprep.&nbsp; Enter the information into the database by running the the
+following command:</p>
+<div class="codehilite"><pre><span class="sr">/usr/</span><span class="nb">local</span><span class="sr">/vcl/</span><span class="n">bin</span><span class="o">/</span><span class="n">vcld</span> <span class="o">-</span><span class="n">setup</span>
+</pre></div>
+
+
+<p>Select "Windows OS Module" and follow the prompts.</p>
+<p><a name="2.2ManagementNodeInstallation-DownloadDrivers"></a></p>
+<h4 id="download-drivers">Download Drivers</h4>
+<p>Drivers which aren't included with Windows must be downloaded and saved to
+the management node. The drivers required will vary greatly depending on
+the hardware. The only way to know what additional drivers you need is to
+install Windows on a computer and check for missing drivers.</p>
+<p>The drivers must be copied to the appropriate directory on the management
+node. The VCL image capture process copies the driver directories to the
+computer before an image is captured. Drivers from multiple directories
+will be copied based on the version of Windows being captured. There are
+driver directories under <strong>tools</strong> for each version of Windows (Windows XP,
+Windows Vista) and for each version group of Windows (version 5, 6). This
+allows drivers which are common to multiple versions of Windows to be
+shared in the management node tools directory structure.</p>
+<p>For example, if a chipset driver works for all versions of Windows, it can
+be saved in:
+<strong>tools/Windows/Drivers/Chipset</strong></p>
+<p>If Windows XP and Windows Server 2003 both use the same network driver, it
+can be saved in:
+<strong>tools/Windows_Version_5/Drivers/Network</strong></p>
+<p>If a storage driver only works for Windows XP, it should be saved in:
+<strong>tools/Windows_XP/Drivers/Storage</strong></p>
+<p>During the image capture process, each Windows version directory is copied
+to the computer under C:\Cygwin\home\root\VCL. The order in which the
+Windows version directories are copied goes from most general to most
+specific.&nbsp; In the example above, the order would be:</p>
+<ol>
+<li><strong>tools/Windows/Drivers/Chipset</strong></li>
+<li><strong>tools/Windows_Version_5/Drivers/Network</strong></li>
+<li><strong>tools/Windows_XP/Drivers/Storage</strong></li>
+</ol>
+<p>The resulting directory structure on the Windows computer will be:</p>
+<ul>
+<li><strong>C:\Cygwin\home\root\VCL\Drivers</strong><ul>
+<li><strong>\Chipset</strong> - driver works for all versions of windows</li>
+<li><strong>\Network</strong> - driver works for Windows XP and Server 2003</li>
+<li><strong>\Storage</strong> - driver only works for Windows XP</li>
+</ul>
+</li>
+</ul>
+<p>The following list shows which driver files should be saved in the driver
+directories:</p>
+<ul>
+<li><strong>tools/Windows/Drivers</strong> - drivers common to all versions of Windows<ul>
+<li><strong>tools/Windows_Version_5/Drivers</strong> - drivers used by Windows XP and Server 2003<ul>
+<li><strong>tools/Windows_Version_XP/Drivers</strong> - drivers only used by Windows XP</li>
+<li><strong>tools/Windows_Version_Server_2003/Drivers</strong> - drivers only used by Windows Server 2003</li>
+</ul>
+</li>
+<li><strong>tools/Windows_Version_6/Drivers</strong> - drivers used by Windows Vista and Server 2008<ul>
+<li><strong>tools/Windows_Vista/Drivers</strong> - drivers only used by Windows Vista</li>
+<li><strong>tools/Windows_Server_2008/Drivers</strong> - drivers only used by Windows Server 2008</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<p>The directory structure under each Drivers directory does not matter. It is
+helpful to organize each directory by driver class, and each directory
+should be organized using the same theme.&nbsp; For example:</p>
+<ul>
+<li><strong>tools/Windows_Version_XP/Drivers</strong><ul>
+<li><strong>Chipset</strong></li>
+<li><strong>Network</strong></li>
+<li><strong>Storage</strong></li>
+<li><strong>Video</strong></li>
+</ul>
+</li>
+</ul>
   </div>
   
   <div id="footer">

Added: websites/staging/vcl/trunk/content/confluence_export/2.2-phpmyadmin-installation-configuration.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/2.2-phpmyadmin-installation-configuration.html (added)
+++ websites/staging/vcl/trunk/content/confluence_export/2.2-phpmyadmin-installation-configuration.html Tue Jan  8 20:52:52 2013
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+  <link href="/css/code.css" rel="stylesheet" type="text/css">
+  <title>Apache VCL - 2.2 phpMyAdmin Installation &amp; Configuration</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="sitetitle">
+    <table width="100%" border="0" cellspacing="0" cellpadding="5">
+      <tr>
+         <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+         <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+      </tr>
+    </table>
+  </div>
+
+  <div id="navigation"> 
+  <ul>
+<li>Information<ul>
+<li><a href="/info/about.html">What is VCL?</a></li>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/info/use-cases.html">Use Cases</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+<li><a href="/info/faq.html">FAQ</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a><ul>
+<li><a href="/docs/using-vcl.html">Using VCL</a></li>
+<li><a href="/docs/image-creation.html">Image Creation</a></li>
+<li><a href="/docs/administration.html">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+<li><a href="/docs/deployment-planning.html">Deployment Planning</a></li>
+</ul>
+</li>
+<li><a href="/comm/index.html">Community</a><ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/comm/index.html#how-do-i-join-the-project">How can I Join</a></li>
+<li><a href="/comm/wiki.html">Wiki</a></li>
+<li><a href="/dev/index.html">Development</a><ul>
+<li><a href="/dev/jira.html">Issue Tracking</a></li>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a><ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+</li>
+</ul>
+  </div>
+  
+  <div id="content">
+    <h1 class="title">2.2 phpMyAdmin Installation &amp; Configuration</h1>
+    <p><a href="http://www.phpmyadmin.net" class="external-link" rel="nofollow">phpMyAdmin</a> is a free and optional tool which allows <a href="http://mysql.com/" class="external-link" rel="nofollow">MySQL</a> to be administered using a web browser. It makes administering the VCL database easier. This tool can be installed on the VCL web server.</p>
+
+<h2><a name="2.2phpMyAdminInstallation%26Configuration-DownloadphpMyAdmin"></a>Download phpMyAdmin</h2>
+
+<ol>
+    <li>Check the version of PHP installed on the web server: <b>php &#45;v</b><br/>
+Use phpMyAdmin 2.x if the version of PHP is 3.x or 4.x:
+<div class="panel" style="border-width: 1px;"><div class="panelContent">
+<p>PHP 4.3.2 (cgi), Copyright (c) 1997-2003 The PHP Group</p>
+</div></div>
+<p>Use phpMyAdmin 3.x if the version of PHP is 5.x:</p>
+
+<div class="panel" style="border-width: 1px;"><div class="panelContent">
+<p>PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)</p>
+</div></div></li>
+    <li>Download the appropriate version of phpMyAdmin from: <a href="http://www.phpmyadmin.net/home_page/downloads.php" class="external-link" rel="nofollow">http://www.phpmyadmin.net/home_page/downloads.php</a></li>
+    <li>Extract the phpMyAdmin package:<br/>
+<b>tar &#45;xzf phpMyAdmin-2.11.9.6-all-languages-utf-8-only.tar.gz</b></li>
+    <li>Move the phpMyAdmin directory to the web server directory:<br/>
+
+<b>mv phpMyAdmin-2.11.9.6-all-languages-utf-8-only /var/www/html/phpmyadmin</b></li>
+    <li>Follow the installation instructions in: <b>/var/www/html/phpmyadmin/Documentation.txt</b><br/>
+<font color="#ff0000"><b>IMPORTANT:</b></font> the instructions must be followed in order to secure phpMyAdmin</li>
+</ol>
+
+<h2><a name="2.2phpMyAdminInstallation%26Configuration-ConfigureVCLTableRelationships"></a>Configure VCL Table Relationships</h2>
+
+<p>An SQL file is provided which will add entries to the pma_table_info table in the phpmyadmin database. These entries cause corresponding information to be displayed when you hover over a value in the VCL database.<a href="http://152.46.17.139/phpmyadmin/tbl_structure.php?db=phpmyadmin&amp;table=pma_table_info&amp;token=400c0bde21942dbd89e5d699621fe692" class="external-link" rel="nofollow">http://152.46.17.139/phpmyadmin/tbl_structure.php?db=phpmyadmin&amp;table=pma_table_info&amp;token=400c0bde21942dbd89e5d699621fe692</a></p>
+
+<ol>
+    <li>Download the following file:<br/>
+&#42;wget <a href="http://svn.apache.org/repos/asf/vcl/trunk/mysql/phpmyadmin.sql*" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/vcl/trunk/mysql/phpmyadmin.sql&#42;</a></li>
+    <li>Import the SQL file into the phpmyadmin database:<br/>
+<b>mysql phpmyadmin &lt; phpmyadmin.sql</b></li>
+</ol>
+  </div>
+  
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+  
+</body>
+</html>

Modified: websites/staging/vcl/trunk/content/confluence_export/2.2-web-code-installation.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/2.2-web-code-installation.html (original)
+++ websites/staging/vcl/trunk/content/confluence_export/2.2-web-code-installation.html Tue Jan  8 20:52:52 2013
@@ -78,39 +78,44 @@
   
   <div id="content">
     <h1 class="title">2.2 Web Code Installation</h1>
-    <p>{excerpt}This page describes how to install and configure the frontend VCL
+    <p>This page describes how to install and configure the frontend VCL
 web code components including the web server prerequisites and frontend VCL
 web code. It also describes how to add local web accounts, configure LDAP
-authentication, and set the timezone correctly.{excerpt}</p>
+authentication, and set the timezone correctly.</p>
 <p><a name="2.2WebCodeInstallation-*Prerequisites*"></a></p>
-<h2 id="prerequisites"><em>Prerequisites</em></h2>
+<h2 id="prerequisites">Prerequisites</h2>
 <p>Your web server should meet the following criteria before installing the
-frontend VCL code:
-<em> Apache HTTP Server v1.3 or v2.x with SSL enabled - while VCL may run
+frontend VCL code:</p>
+<ul>
+<li>Apache HTTP Server v1.3 or v2.x with SSL enabled - while VCL may run
 under another webserver capable of running PHP code, it has only been
-tested to work with Apache HTTP Server
-</em> PHP 5
-<em> php modules that should be installed (depending on your Linux distro,
+tested to work with Apache HTTP Server</li>
+<li>PHP 5</li>
+<li>php modules that should be installed (depending on your Linux distro,
 some of these may be compiled in to php instead of being a separate
-module):
-<strong> php-gd
-</strong> php-json (if your PHP version is &lt; 5.2, this is not required)
-<strong> php-mcrypt
-</strong> php-mysql
-<strong> php-openssl
-</strong> php-sysvsem
-<strong> php-xml
-</strong> php-xmlrpc
-</em><em> php-ldap (if you will be using ldap authentication)
-</em> If you are running RedHat or CentOS, these can be installed with</p>
-<div class="codehilite"><pre><span class="n">yum</span> <span class="n">install</span> <span class="n">httpd</span> <span class="n">mod_ssl</span> <span class="n">php</span><span class="o">-</span><span class="n">gd</span> <span class="n">php</span><span class="o">-</span><span class="n">mcrypt</span> <span class="n">php</span><span class="o">-</span><span class="n">mysql</span> <span class="n">php</span><span class="o">-</span><span class="n">xml</span> <span class="n">php</span><span class="o">-</span><span class="n">xmlrpc</span>
+module):<ul>
+<li>php-gd</li>
+<li>php-json (if your PHP version is &lt; 5.2, this is not required)</li>
+<li>php-mcrypt</li>
+<li>php-mysql</li>
+<li>php-openssl</li>
+<li>php-sysvsem</li>
+<li>php-xml</li>
+<li>php-xmlrpc</li>
+<li>php-ldap (if you will be using ldap authentication)</li>
+</ul>
+</li>
+<li>
+<p>If you are running RedHat or CentOS, these can be installed with</p>
+<div class="codehilite"><pre><span class="n">yum</span> <span class="n">install</span> <span class="n">httpd</span> <span class="n">mod_ssl</span> <span class="n">php</span><span class="o">-</span><span class="n">gd</span> <span class="n">php</span><span class="o">-</span><span class="n">mcrypt</span> <span class="n">php</span><span class="o">-</span><span class="n">mysql</span> <span class="n">php</span><span class="o">-</span><span class="n">xml</span> <span class="n">php</span><span class="o">-</span><span class="n">xmlrpc</span> <span class="n">php</span><span class="o">-</span><span class="n">ldap</span>
 </pre></div>
 
 
-<p>php-ldap</p>
-<ul>
-<li>If you will be using a self-signed certificate for SSL, <a href="http://wiki.centos.org/HowTos/Https">this is a great HOWTO </a>
- explaining how to set that up on CentOS.</li>
+</li>
+<li>
+<p>If you will be using a self-signed certificate for SSL, <a href="http://wiki.centos.org/HowTos/Https">this is a great HOWTO </a>
+ explaining how to set that up on CentOS.</p>
+</li>
 <li>useful to have the server set up to be able to send debugging emails</li>
 <li>php-mcrypt requires libmcrypt and mcrypt libraries as dependencies. 
 These may need to be installed first.</li>
@@ -118,10 +123,10 @@ These may need to be installed first.</l
 <p><a name="2.2WebCodeInstallation-*InstallingVCLFrontendWebCode*"></a></p>
 <h2 id="installing-vcl-frontend-web-code"><em>Installing VCL Frontend Web Code</em></h2>
 <ol>
-<li>If you haven't already done so, download and extract a copy of the latest
-release. There is a link to it under the Project Resources section on our
-wiki <a href="apache-vcl.html">home page</a>
-. Look for "Current version".</li>
+<li>
+<p>If you haven't already done so, download and extract a copy of the release. 
+There is a link to it on our <a href="/downloads/download.cgi">download page</a>.</p>
+</li>
 <li>
 <p>copy the "web" directory to a location somewhere under the web root of
 your web server:</p>
@@ -130,15 +135,9 @@ your web server:</p>
 <li>
 <p>copy/rename secrets-default.php to secrets.php</p>
 </li>
-<li>modify vcl/.ht-inc/secrets.php</li>
-<li>
-<ul>
+<li>modify vcl/.ht-inc/secrets.php<ul>
 <li>set $vclhost, $vcldb, $vclusername, and $vclpassword to match your
 database setup</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>create random passwords for $mcryptkey, $mcryptiv, and $pemkey -
 $mcryptiv must be 8 hex characters</li>
 </ul>
@@ -150,88 +149,62 @@ here)</li>
 <li>modify vcl/.ht-inc/conf.php to match your site - COOKIEDOMAIN needs to be
 the domain name your web server is using, or left blank if you are
 accessing it by IP only.
-*<em>You really need to modify every entry in the "Things in this section
-must be modified" part of the file.</em>*</li>
-<li>*<em>NOTICE</em>* JpGraph 2.x is no longer available.  JpGraph 3.x is released
+<strong>You really need to modify every entry in the "Things in this section
+must be modified" part of the file.</strong></li>
+<li><strong>NOTICE</strong> JpGraph 2.x is no longer available.  JpGraph 3.x is released
 under a dual license. QPL 1.0 (Qt Free Licensee).  Free for non-commercial,
 open-source or educational use (JpGraph Professional License for commercial
 use).  If you are planning to use this for commercial use and don't want to
 pay for JpGraph, you can safely skip this step with the only side effect of
 not being able to display a few graphs on the statistics page.
 Download JpGraph from <a href="http://www.aditus.nu/jpgraph/jpdownload.php">http://www.aditus.nu/jpgraph/jpdownload.php</a></li>
-<li>
-<ul>
 <li>download the 3.x series, extract it, and copy the src directory from it
 to vcl/.ht-inc/jpgraph</li>
-</ul>
-</li>
 <li>make the .ht-inc/maintenance directory writable by the web server user -
 i.e. if the httpd process is running as user 'apache' run 'chown apache
 .ht-inc/maintenance'</li>
 <li>open the testsetup.php page in a web browser</li>
-<li>
-<ul>
-<li>i.e. if you set up your site to be <a href="https://my.server.org/vcl/">https://my.server.org/vcl/</a>
- open [https://my.server.org/vcl/testsetup.php]</li>
-</ul>
-</li>
+<li>i.e. if you set up your site to be <strong>https://my.server.org/vcl/</strong> open
+<strong>https://my.server.org/vcl/testsetup.php</strong></li>
 <li>debug any issues reported by testsetup.php</li>
 <li>now, open the index.php page in your browser</li>
-<li>select Local Account and use 'admin' as the user and 'adminVc1passw0rd'
-as the password
-**Now would be a good time to change the password from the default by
-going to User Preferences</li>
-<li>click the "Management Nodes" link</li>
-<li>enter the hostname and IP of your management node</li>
-<li>click Add</li>
-<li>fill in these additional required fields:</li>
 <li>
-<ul>
-<li>SysAdmin Email Address - error emails will be sent to this address</li>
-</ul>
-</li>
-<li>
-<ul>
-<li>Install Path - this is parent directory under which image files will be
+<p>select Local Account and use 'admin' as the user and 'adminVc1passw0rd'
+as the password</p>
+<p>**Now would be a good time to change the password from the default by
+going to User Preferences
+1. click the "Management Nodes" link
+1. enter the hostname and IP of your management node
+1. click Add
+1. fill in these additional required fields:
+   * SysAdmin Email Address - error emails will be sent to this address
+   * Install Path - this is parent directory under which image files will be
 stored - only required if doing bare metal installs or using VMWare with
-local disks</li>
-</ul>
-</li>
-<li>
-<ul>
-<li>End Node SSH Identity Key Files - probably just enter "/etc/vcl/vcl.key"</li>
-</ul>
-</li>
-<li>optionally, fill in these unrequired fields:</li>
-<li>
-<ul>
-<li>Address for Shadow Emails - End users are sent various emails about the
+local disks
+   * End Node SSH Identity Key Files - probably just enter "/etc/vcl/vcl.key"
+1. optionally, fill in these unrequired fields:
+   * Address for Shadow Emails - End users are sent various emails about the
 status of their reservations. If this field is configured, copies of all of
-those emails will be sent to this address.</li>
-</ul>
-</li>
-<li>
-<ul>
-<li>Public NIC configuration method - this defaults to Dynamic DHCP - if
+those emails will be sent to this address.
+   * Public NIC configuration method - this defaults to Dynamic DHCP - if
 DHCP is not available for the public interface of your nodes, you can set
 this to Static. Then, the IP configuration on the nodes will be manually
 set using Public Netmask, Public Gateway, Public DNS Server, and the IP
-address set for the computer under Manage Computers</li>
-</ul>
+address set for the computer under Manage Computers
+1. click "Confirm Management Node"
+1. click Submit
+1. click the "Management Nodes" link
+1. select "Edit Management Node Grouping"
+1. click Submit
+1. select the checkbox for your management node
+1. click Submit</p>
 </li>
-<li>click "Confirm Management Node"</li>
-<li>click Submit</li>
-<li>click the "Management Nodes" link</li>
-<li>select "Edit Management Node Grouping"</li>
-<li>click Submit</li>
-<li>select the checkbox for your management node</li>
-<li>click Submit</li>
 </ol>
 <p><a href="further-steps-if-using-only-vmware.html">Further steps if using only VMWare</a></p>
 <p><a href="further-steps-if-using-xcat.html">Further steps if using xCAT</a></p>
 <p>Next Step: <a href="2.2-management-node-installation.html">Management Node Installation</a></p>
 <p><a name="2.2WebCodeInstallation-*Addingextralocalaccounts*"></a></p>
-<h2 id="adding-extra-local-accounts"><em>Adding extra local accounts</em></h2>
+<h2 id="adding-extra-local-accounts">Adding extra local accounts</h2>
 <p>Additional local accounts can now be added using the backend code. After
 you have finished the backend install, run</p>
 <div class="codehilite"><pre><span class="n">vcld</span> <span class="o">-</span><span class="n">setup</span>

Modified: websites/staging/vcl/trunk/content/confluence_export/adding-ldap-authentication.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/adding-ldap-authentication.html (original)
+++ websites/staging/vcl/trunk/content/confluence_export/adding-ldap-authentication.html Tue Jan  8 20:52:52 2013
@@ -102,25 +102,27 @@ to be added to /etc/pki/tls/certs/ca-bun
 generate the lines that need to be added to the ca-bundle.crt file.</li>
 <li>
 <p>After adding the certificate, restart httpd:</p>
-<p>service httpd restart</p>
+<div class="codehilite"><pre><span class="n">service</span> <span class="n">httpd</span> <span class="n">restart</span>
+</pre></div>
+
+
 </li>
 <li>
 <p>You can verify that the certificate is properly installed using this
 command:</p>
-<p>openssl s_client -showcerts -CAfile /etc/pki/tls/certs/ca-bundle.crt
--connect your.ldap.server.here:636</p>
-</li>
-</ul>
+<div class="codehilite"><pre><span class="n">openssl</span> <span class="n">s_client</span> <span class="o">-</span><span class="n">showcerts</span> <span class="o">-</span><span class="n">CAfile</span> <span class="sr">/etc/</span><span class="n">pki</span><span class="sr">/tls/c</span><span class="n">erts</span><span class="o">/</span><span class="n">ca</span><span class="o">-</span><span class="n">bundle</span><span class="o">.</span><span class="n">crt</span> <span class="o">-</span><span class="nb">connect</span> <span class="n">your</span><span class="o">.</span><span class="n">ldap</span><span class="o">.</span><span class="n">server</span><span class="o">.</span><span class="n">here:636</span>
+</pre></div>
+
+
 <p>If you see "Verify return code: 0 (ok)" at the end of the output, then it
 is installed correctly. If you see a different return code, then you'll
 need to work through the problem.
 * You may need to add a line to /etc/openldap/ldap.conf to point to the
 ca-bundle.crt file. I'm not sure of a good way to tell if you need it or
 not, but if you do, add the following:</p>
-<div class="codehilite"><pre><span class="n">TLS_CACERT</span> <span class="sr">/etc/</span><span class="n">pki</span><span class="sr">/tls/c</span><span class="n">erts</span><span class="o">/</span><span class="n">ca</span><span class="o">-</span><span class="n">bundle</span><span class="o">.</span><span class="n">crt</span>
-</pre></div>
-
-
+<p>TLS_CACERT /etc/pki/tls/certs/ca-bundle.crt</p>
+</li>
+</ul>
 <p><a name="AddingLDAPAuthentication-AddingLDAPAuthenticationtotheWebCode"></a></p>
 <h3 id="adding-ldap-authentication-to-the-web-code">Adding LDAP Authentication to the Web Code</h3>
 <ul>
@@ -133,10 +135,13 @@ of your organization are a good idea. Th
 following to add the affiliation, replacing 'EXAMPLE' with the name you
 chose. Take note of the id from the 2nd SQL statement as you will need it
 later. It is the affiliationid for this affiliation.</p>
-<p>mysql vcl
-INSERT INTO affiliation (name) VALUES ('EXAMPLE');
-SELECT id FROM affiliation WHERE name = 'EXAMPLE';
-exit</p>
+<div class="codehilite"><pre><span class="n">mysql</span> <span class="n">vcl</span>
+<span class="n">INSERT</span> <span class="n">INTO</span> <span class="n">affiliation</span> <span class="p">(</span><span class="n">name</span><span class="p">)</span> <span class="n">VALUES</span> <span class="p">(</span><span class="s">&#39;EXAMPLE&#39;</span><span class="p">);</span>
+<span class="n">SELECT</span> <span class="n">id</span> <span class="n">FROM</span> <span class="n">affiliation</span> <span class="n">WHERE</span> <span class="n">name</span> <span class="o">=</span> <span class="s">&#39;EXAMPLE&#39;</span><span class="p">;</span>
+<span class="nb">exit</span>
+</pre></div>
+
+
 </li>
 <li>
 <p>Edit conf.php and search for "EXAMPLE1 LDAP"</p>
@@ -146,93 +151,94 @@ the '*/' at the end of 'to use this logi
 <li>Change 'EXAMPLE1 LDAP' to something to match your location, for example
 at NCSU, it is 'NCSU LDAP'. This string is what users will see where they
 select the authentication mechanism to use when logging in.</li>
-<li>Modify the following fields:
-<strong> server - this is the hostname of your LDAP server
-</strong> binddn - typically, you'll want to use the base DN of your LDAP server;
+<li>Modify the following fields:<ul>
+<li>server - this is the hostname of your LDAP server</li>
+<li>binddn - typically, you'll want to use the base DN of your LDAP server;
 for Active Directory, this is usually dc= for each of your domain name
 components. For example, your your domain name was ad.example.org, it would
-be "dc=ad,dc=example,dc=org"
-<strong> userid - this is a string that is added to the userid a user enters on
+be "dc=ad,dc=example,dc=org"</li>
+<li>userid - this is a string that is added to the userid a user enters on
 the login page. Place a '%s' where the entered userid should go. Some
-examples are:
-<strong><em> %s@example.org
-</em></strong> %s@ad.example.org
-</strong><em> uid=%s,ou=accounts,dc=example,dc=org'
-<strong> unityid - this is the ldap field that contains a user's login id (for
-Active Directory, this is usually sAMAccountName)
-</strong> firstname - this is the ldap field that contains a user's first name
-<strong> lastname - this is the ldap field that contains a user's last name
-</strong> email - this is the ldap field that contains a user's email address
-<strong> defaultemail - if an email address is not provided by the ldap server,
+examples are:<ul>
+<li>%s@example.org</li>
+<li>%s@ad.example.org</li>
+<li>uid=%s,ou=accounts,dc=example,dc=org'</li>
+</ul>
+</li>
+<li>unityid - this is the ldap field that contains a user's login id (for
+Active Directory, this is usually sAMAccountName)</li>
+<li>firstname - this is the ldap field that contains a user's first name</li>
+<li>lastname - this is the ldap field that contains a user's last name</li>
+<li>email - this is the ldap field that contains a user's email address</li>
+<li>defaultemail - if an email address is not provided by the ldap server,
 this will be appended to the end of the userid to create an email address.
-In this case, email notifications will be disabled by default.
-</strong> masterlogin - this is the vcllookup account referred to in the
+In this case, email notifications will be disabled by default.</li>
+<li>masterlogin - this is the vcllookup account referred to in the
 "Prerequisites for your LDAP server" section - comment out this line if
-using anonymous binds
-<strong> masterpwd - password for the masterlogin account - comment out this line
-if using anonymous binds
-</strong> affiliationid - this is the id from the SELECT statement in the first
-step
-</em>* help - this is some text that will show up on the page where users
+using anonymous binds</li>
+<li>masterpwd - password for the masterlogin account - comment out this line
+if using anonymous binds</li>
+<li>affiliationid - this is the id from the SELECT statement in the first
+step</li>
+<li>help - this is some text that will show up on the page where users
 select the authentication method explaining why they would select this
 option</li>
+</ul>
+</li>
 <li>Next, there are 6 arrays that would need to be modified, but can be
 replaced with a block of code.</li>
 <li>
 <p>Delete the following lines:</p>
-<p>$affilValFunc = array(1 =&gt; create_function('', 'return 0;'),
-              /<em>3 =&gt; "validateLDAPUser",</em>/
-);</p>
-<p>$affilValFuncArgs = array(/<em>3 =&gt; 'EXAMPLE1 LDAP',</em>/
-);</p>
-<p>$addUserFunc = array(1 =&gt; create_function('', 'return 0;'),
-             /<em>3 =&gt; 'addLDAPUser',</em>/
-);</p>
-<p>$addUserFuncArgs = array(/<em>3 =&gt; 'EXAMPLE1 LDAP',</em>/
-);</p>
-<p>$updateUserFunc = array(1 =&gt; create_function('', 'return 0;'),
-            /<em>3 =&gt; 'updateLDAPUser',</em>/
-);</p>
-<p>$updateUserFuncArgs = array(/<em>3 =&gt; 'EXAMPLE1 LDAP',</em>/
-);</p>
+<div class="codehilite"><pre><span class="nv">$affilValFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">(</span><span class="mi">1</span> <span class="o">=&gt;</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 0;&#39;</span><span class="p">),</span>
+              <span class="sr">/*3 =&gt; &quot;validateLDAPUser&quot;,*/</span>
+<span class="p">);</span>
+
+<span class="nv">$affilValFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">(</span><span class="sr">/*3 =&gt; &#39;EXAMPLE1 LDAP&#39;,*/</span>
+<span class="p">);</span>
+
+<span class="nv">$addUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">(</span><span class="mi">1</span> <span class="o">=&gt;</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 0;&#39;</span><span class="p">),</span>
+             <span class="sr">/*3 =&gt; &#39;addLDAPUser&#39;,*/</span>
+<span class="p">);</span>
+
+<span class="nv">$addUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">(</span><span class="sr">/*3 =&gt; &#39;EXAMPLE1 LDAP&#39;,*/</span>
+<span class="p">);</span>
+
+<span class="nv">$updateUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">(</span><span class="mi">1</span> <span class="o">=&gt;</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 0;&#39;</span><span class="p">),</span>
+            <span class="sr">/*3 =&gt; &#39;updateLDAPUser&#39;,*/</span>
+<span class="p">);</span>
+
+<span class="nv">$updateUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">(</span><span class="sr">/*3 =&gt; &#39;EXAMPLE1 LDAP&#39;,*/</span>
+<span class="p">);</span>
+</pre></div>
+
+
 </li>
 </ul>
 <p>and replace them with</p>
-<div class="codehilite"><pre><span class="nv">$affilValFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="nv">$affilValFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="nv">$addUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="nv">$addUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="nv">$updateUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="nv">$updateUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="k">foreach</span><span class="p">(</span><span class="nv">$authMechs</span> <span class="n">as</span> <span class="nv">$key</span> <span class="o">=&gt;</span> <span class="nv">$item</span><span class="p">)</span> <span class="p">{</span>
-   <span class="k">if</span><span class="p">(</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;type&#39;</span><span class="p">]</span>
+<div class="codehilite"><pre>    <span class="nv">$affilValFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+    <span class="nv">$affilValFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+    <span class="nv">$addUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+    <span class="nv">$addUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+    <span class="nv">$updateUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+    <span class="nv">$updateUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
+    <span class="k">foreach</span><span class="p">(</span><span class="nv">$authMechs</span> <span class="n">as</span> <span class="nv">$key</span> <span class="o">=&gt;</span> <span class="nv">$item</span><span class="p">)</span> <span class="p">{</span>
+       <span class="k">if</span><span class="p">(</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;type&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="s">&#39;ldap&#39;</span><span class="p">)</span> <span class="p">{</span>
+          <span class="nv">$affilValFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="s">&#39;validateLDAPUser&#39;</span><span class="p">;</span>
+          <span class="nv">$affilValFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+          <span class="nv">$addUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="s">&#39;addLDAPUser&#39;</span><span class="p">;</span>
+          <span class="nv">$addUserFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+          <span class="nv">$updateUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="s">&#39;updateLDAPUser&#39;</span><span class="p">;</span>
+          <span class="nv">$updateUserFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+       <span class="p">}</span>
+       <span class="n">elseif</span><span class="p">(</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;type&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="s">&#39;local&#39;</span><span class="p">)</span> <span class="p">{</span>
+          <span class="nv">$affilValFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
+          <span class="nv">$addUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
+          <span class="nv">$updateUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
+       <span class="p">}</span>
+    <span class="p">}</span>
 </pre></div>
 
 
-<p>== 'ldap') {
-          $affilValFunc[$item['affiliationid']
-] = 'validateLDAPUser';
-          $affilValFuncArgs[$item['affiliationid']
-] = $key;
-          $addUserFunc[$item['affiliationid']
-] = 'addLDAPUser';
-          $addUserFuncArgs[$item['affiliationid']
-] = $key;
-          $updateUserFunc[$item['affiliationid']
-] = 'updateLDAPUser';
-          $updateUserFuncArgs[$item['affiliationid']
-] = $key;
-       }
-       elseif($item['type']
- == 'local') {
-          $affilValFunc[$item['affiliationid']
-] = create_function('', 'return 0;');
-          $addUserFunc[$item['affiliationid']
-] = create_function('', 'return 0;');
-          $updateUserFunc[$item['affiliationid']
-] = create_function('', 'return 0;');
-       }
-    }</p>
 <ul>
 <li>uncomment the require_once line for ldapauth.php toward the bottom of the
 file</li>
@@ -242,17 +248,18 @@ file</li>
 <p>If your LDAP server has users in multiple containers, then the full DN for
 each user must be looked up before doing a bind to the LDAP server to
 authenticate the user. In this case, you'll need to modify
-authentication.php.
-<em> edit authenciation.php
-</em> search for ldapLogin
-<em> search for EXAMPLE1 LDAP in the function
-</em> uncomment the block of code it is contained in by removing the '/*' at the beginning of the line containing 'EXAMPLE1 LDAP', and removing the '*/' at the end of the else that is before '$ldapuser = sprintf($authMechs<a href="$authtype.html">$authtype</a>
-['userid'], $userid);'
-<em> Look for the line containing 'cn=$userid'. If you use 'cn' to look up
+authentication.php.</p>
+<ul>
+<li>edit authenciation.php</li>
+<li>search for ldapLogin</li>
+<li>search for EXAMPLE1 LDAP in the function</li>
+<li>uncomment the block of code it is contained in by removing the '/*' at the beginning of the line containing 'EXAMPLE1 LDAP', and removing the '*/' at the end of the else that is before '$ldapuser = sprintf($authMechs[$authtype]['userid'], $userid);'</li>
+<li>Look for the line containing 'cn=$userid'. If you use 'cn' to look up
 userids in your LDAP server, the line is fine as is. If you use something
 else, such as 'uid', change 'cn' to 'uid' or whatever is used on your LDAP
-server.
-</em> save the file</p>
+server.</li>
+<li>save the file</li>
+</ul>
   </div>
   
   <div id="footer">

Added: websites/staging/vcl/trunk/content/confluence_export/adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-unofficial.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-unofficial.html (added)
+++ websites/staging/vcl/trunk/content/confluence_export/adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-unofficial.html Tue Jan  8 20:52:52 2013
@@ -0,0 +1,172 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+  <link href="/css/code.css" rel="stylesheet" type="text/css">
+  <title>Apache VCL - Adding support for partimage and partimage-ng to xCAT 2.x (unofficial)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="sitetitle">
+    <table width="100%" border="0" cellspacing="0" cellpadding="5">
+      <tr>
+         <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+         <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+      </tr>
+    </table>
+  </div>
+
+  <div id="navigation"> 
+  <ul>
+<li>Information<ul>
+<li><a href="/info/about.html">What is VCL?</a></li>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/info/use-cases.html">Use Cases</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+<li><a href="/info/faq.html">FAQ</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a><ul>
+<li><a href="/docs/using-vcl.html">Using VCL</a></li>
+<li><a href="/docs/image-creation.html">Image Creation</a></li>
+<li><a href="/docs/administration.html">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+<li><a href="/docs/deployment-planning.html">Deployment Planning</a></li>
+</ul>
+</li>
+<li><a href="/comm/index.html">Community</a><ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/comm/index.html#how-do-i-join-the-project">How can I Join</a></li>
+<li><a href="/comm/wiki.html">Wiki</a></li>
+<li><a href="/dev/index.html">Development</a><ul>
+<li><a href="/dev/jira.html">Issue Tracking</a></li>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a><ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+</li>
+</ul>
+  </div>
+  
+  <div id="content">
+    <h1 class="title">Adding support for partimage and partimage-ng to xCAT 2.x (unofficial)</h1>
+    <p>This is how I added support for partimage/partimage-ng to xCAT 2.x</p>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-Overview"></a>Overview</h2>
+
+<p>The method I used was based on a suggestion by Egan Ford.  I created an xCAT plugin to handle the imaging commands.  That plugin sets the node to boot a stateless image and configures a certain postscript to run that handles the image capture/restore.</p>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-partimageng.pmxCATplugin"></a>partimageng.pm xCAT plugin</h2>
+
+<p>First, I created an xCAT plugin to handle 2 nodeset commands for os type <b>image</b>: <em>install</em> and <em>image</em>.  This allows you to set the os type for a node to <b>image</b> and then run one of</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+
+<pre class="code-java">
+nodeset &lt;node&gt; image
+nodeset &lt;node&gt; install
+</pre>
+</div>
+
+<p></div>
+<p>which will cause an image of the node to be captured or installed the next time the node is booted.  The architecture for the node must always be set to x86 for this, but it will handle imaging/restoring both x86 and x86_64.</p></p>
+<p>To use it, <a href="https://svn.apache.org/repos/asf/vcl/sandbox/xcat2partimageng/partimageng.pm" class="external-link" rel="nofollow">download</a> it from our SVN repository and put it in lib/perl/xCAT_plugin under your XCATROOT directory.</p>
+
+<p>partimageng.pm requires a kickstart template file to be installed in your XCATROOT as share/xcat/install/image/default.tmpl. It should contain a single line with these contents:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+#INCLUDE:../scripts/post.rh#
+</pre>
+</div></div>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-partimagengpostscript"></a>partimageng postscript</h2>
+
+<p>The partimageng.pm xCAT plugin configures the node to boot a stateless image and then to run the partimageng postscript.  This postscript handles the image capture/restore.  I did it all in a postscript to keep from having to rebuild the stateless image each time the capture/restore code needed to be modified.  The postscript can handle both partimage and partimage-ng formats. I initially only supported partimage-ng, but then realized that presented a compatibility problem where all of our previous images would have to be converted. There is a flag in the script to set which of the two applications gets used to create images that can be manually modified or passed in as a kernel parameter (I haven't set up a way for the partimageng.pm plugin to pass that kernel parameter yet though). Also, it determines what drive to image/install based on some stuff in /dev and /proc. The device can be specified as a kernel parameter, but again, this hasn't been added to the xCAT plugin.
  Right now, it only works with /dev/sda, /dev/sdb, /dev/hda, or /dev/hdb.</p>
+
+<p><a href="https://svn.apache.org/repos/asf/vcl/sandbox/xcat2partimageng/partimageng" class="external-link" rel="nofollow">Download</a> it from our SVN repository and put it in your xCAT postscripts directory.</p>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-listener.py"></a>listener.py</h2>
+
+<p>This is a script I took from what was already part of xCAT that provides a way for xCAT's nodestat command to get the status of an install. I modified it to give the status of a partimage-ng or partimage install.</p>
+
+<p>It needs to go in a directory I came up with to put the root image and required files. It is under your install path, for me, that is /install, so you need to put <a href="https://svn.apache.org/repos/asf/vcl/sandbox/xcat2partimageng/listener.py" class="external-link" rel="nofollow">listener.py</a> at /install/image/x86/installer_files</p>
+
+<p>Also make sure to make listener.py executable:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+
+chmod +x listener.py
+</pre>
+</div>
+
+</div>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-statelessimage"></a>stateless image</h2>
+
+<p>This is the harder part. The images I have were built for IBM HS20, HS21, and HS22 blades. If you have other hardware, you may be able to use an existing kernel you have and update the kernel modules in the images I created. If that doesn't work, you'll need to create your own images. Since I don't have any notes on how I created them, I'll wait until someone needs help doing that to figure it out again (send a message to the vcl-user list). The short answer is to look at the xCAT docs on building a stateless image for your hardware. These images default to using eth0 as the installation NIC. To use a different NIC, set 'installnic' in the noderes table to the desired NIC. The root image contains the partimage and partimage-ng binaries.</p>
+
+<p>There are three parts:</p>
+
+<ul>
+    <li><a href="http://people.apache.org/~jfthomps/partimageng_xCAT2x/vmlinuz" class="external-link" rel="nofollow">kernel - vmlinuz</a></li>
+    <li><a href="http://people.apache.org/~jfthomps/partimageng_xCAT2x/initrd.img" class="external-link" rel="nofollow">initial RAM disk - initrd.img</a></li>
+
+    <li><a href="http://people.apache.org/~jfthomps/partimageng_xCAT2x/rootimg.gz" class="external-link" rel="nofollow">root image - rootimg.gz</a></li>
+</ul>
+
+<p>Put vmlinuz and initrd.img at /tftpboot/xcat/image/x86.<br/>
+Put rootimg.gz the same place you put the listener.py script (/install/image/x86/installer_files for me)</p>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-ConfigurexCAT"></a>Configure xCAT</h2>
+
+<p>The installer image uses NFS to mount the image store. In the past, it mounted the management node.  It has now been updated to be able to mount any NFS export available on the install network.  Two additional items need to be added to the xCAT site table:</p>
+
+<ul>
+    <li>IMAGELIBSERVER - this is the hostname or IP of the NFS server</li>
+    <li>IMAGELIBINSTALLDIR - this is the directory being exported by the NFS server</li>
+</ul>
+  </div>
+  
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+  
+</body>
+</html>

Modified: websites/staging/vcl/trunk/content/confluence_export/further-steps-if-using-only-vmware.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/further-steps-if-using-only-vmware.html (original)
+++ websites/staging/vcl/trunk/content/confluence_export/further-steps-if-using-only-vmware.html Tue Jan  8 20:52:52 2013
@@ -95,57 +95,17 @@ same thing but checking the "Add Multipl
 <li>select the "Add Single Computer" radio button</li>
 <li>click Submit</li>
 <li>fill in</li>
-<li>
-<ul>
 <li>Hostname</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>IP Address</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>State - vmhostinuse - double check this because you will not be able to
 change it later</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>owner (admin@Local)</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>RAM</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Proc Speed</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Network Speed</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Type - blade</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Provisioning Engine - xCAT 2.x Provisioning</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>click the checkbox under "allcomputers"</li>
-</ul>
-</li>
 <li>click Confirm Computer</li>
 <li>click Submit</li>
 <li>select a VM Host Profile to use with this host - you can edit the VM Host
@@ -166,78 +126,26 @@ virtual machines.</p>
 <li>select the "Add Multiple Computers" radio button</li>
 <li>click Submit</li>
 <li>fill in</li>
-<li>
-<ul>
 <li>Hostname - the hostnames of all the computers must have a numerical part
 that is sequential, use a % as a placeholder where that part would be</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Start value - the first number of the numerical part of the hostname</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>End value - the last number of the numerical part of the hostname</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Start IP Address - if using static public addresses, the IP addresses
 must be sequential; enter the first address here; if using DHCP, just enter
 something like 1.1.1.1</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>End IP address - the last IP address of the sequence; if using DHCP,
 you'll need to enter something that would work out to the last address
 relative to Start IP Address (i.e. if adding 3 computers, use 1.1.1.1 for
 start and 1.1.1.3 for end)</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>State - vmhostinuse - double check this because you will not be able to
 change it later</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Owner - owner of the computer</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>RAM</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Processor Speed</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Network Speed</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Type - blade</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Provisioning Engine - xCAT 2.x</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>check allComputers</li>
-</ul>
-</li>
 <li>click Confirm Computers</li>
 <li>click Submit</li>
 <li>select a VM Host Profile to use with these hosts - you can edit the VM
@@ -251,101 +159,37 @@ Host Profile later if needed</li>
 <li>select the "Add Multiple Computers" radio button</li>
 <li>click Submit</li>
 <li>fill in</li>
-<li>
-<ul>
 <li>Hostname - the hostnames of all the computers must have a numerical part
 that is sequential, use a % as a placeholder where that part would be</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Start value - the first number of the numerical part of the hostname</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>End value - the last number of the numerical part of the hostname</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Start IP Address - if using static public addresses, the IP addresses
 must be sequential; enter the first address here; if using DHCP, just enter
 something like 1.1.1.1</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>End IP address - the last IP address of the sequence; if using DHCP,
 you'll need to enter something that would work out to the last address
 relative to Start IP Address (i.e. if adding 3 computers, use 1.1.1.1 for
 start and 1.1.1.3 for end)</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Start private IP Address - similar to Start IP Address, but for the
 private side</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>End private IP Address - similar to the End IP Address but for the
 private side</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Start MAC Address - if mac addresses are sequential, with the first one
 being the private MAC address for the first computer, the second one being
 the public MAC address for the first computer, the third one being the
 private MAC address of the second computer, etc, you can enter the first
 one here and then have the option of generating data to add to your
 dhcpd.conf file later in the process.
-{color:#ff0000}{<em>}Important{</em>}{color}: for VMware VMs, the MAC addresses
+<strong>Important</strong>: for VMware VMs, the MAC addresses
 you choose must be in the range&nbsp;00:50:56:00:00:00 - 00:50:56:3F:FF:FF</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>State - maintenance</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Owner - owner of the computer</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>RAM</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Processor Speed</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Network Speed</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Type - virtualmachine</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Provisioning Engine - VMware</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>check "All VM Computers" and newvmimages</li>
-</ul>
-</li>
 <li>click Confirm Computers</li>
 <li>click Submit</li>
 <li>If you filled in the private address fields and the Start MAC Address,

Modified: websites/staging/vcl/trunk/content/confluence_export/further-steps-if-using-xcat.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/further-steps-if-using-xcat.html (original)
+++ websites/staging/vcl/trunk/content/confluence_export/further-steps-if-using-xcat.html Tue Jan  8 20:52:52 2013
@@ -104,72 +104,24 @@ started checking in, you should be able 
 <li>select the "Add Multiple Computers" radio button</li>
 <li>click Submit</li>
 <li>fill in</li>
-<li>
-<ul>
 <li>Hostname - the hostnames of all the computers must have a numerical part
 that is sequential, use a % as a placeholder where that part would be</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Start value - the first number of the numerical part of the hostname</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>End value - the last number of the numerical part of the hostname</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Start IP Address - if using static public addresses, the IP addresses
 must be sequential; enter the first address here; if using DHCP, just enter
 something like 1.1.1.1</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>End IP address - the last IP address of the sequence; if using DHCP,
 you'll need to enter something that would work out to the last address
 relative to Start IP Address (i.e. if adding 3 computers, use 1.1.1.1 for
 start and 1.1.1.3 for end)</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Owner - owner of the computer</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>RAM</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Processor Speed</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Network Speed</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Type - blade</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Provisioning Engine - xCAT 2.x</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>check allComputers and newimages</li>
-</ul>
-</li>
 <li>click Confirm Computer</li>
 <li>click Submit (don't worry about the fact that the computers you just
 added aren't listed after clicking Submit)</li>

Modified: websites/staging/vcl/trunk/content/confluence_export/missing_from_export.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/missing_from_export.html (original)
+++ websites/staging/vcl/trunk/content/confluence_export/missing_from_export.html Tue Jan  8 20:52:52 2013
@@ -79,30 +79,28 @@
   <div id="content">
     <h1 class="title"></h1>
     <p>The following pages were not properly exported and need to be manually copied from Confluence:</p>
-<p>2.2-phpmyadmin-installation-&amp;-configuration.mdtext
-adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-(unofficial).mdtext
-administrator\'s-faq.mdtext
-current-&amp;-future-development-topics.mdtext
-how-to\'s.mdtext
-install-&amp;-configure-cygwin-sshd.mdtext
-meeting-&amp;-conference-call-notes.mdtext
-phpmyadmin-installation-&amp;-configuration.mdtext
-place-holder-for-vcl-2.4-(unreleased).mdtext
-resource-grouping-&amp;-mapping.mdtext
-upgrade-from-previous-version-(2.1-to-2.2.1).mdtext
-upgrade-from-previous-version-(2.1-to-2.3).mdtext
-upgrade-from-previous-version-(2.2.1-to-2.3).mdtext
-upgrade-from-previous-version-(2.2-to-2.2.1).mdtext
-upgrade-from-previous-version-(2.2-to-2.3).mdtext
-vcl-2.2.1-phpmyadmin-installation-&amp;-configuration.mdtext
-vcl-2.3-phpmyadmin-installation-&amp;-configuration.mdtext
-vmware-configuration-(2.2.1-and-below).mdtext
-database.mdtext
-apache-vcl-community.mdtext
-code-documentation.mdtext
-design-considerations.mdtext
-development-environment-tips.mdtext
-development.mdtext</p>
+<p>administrator\'s-faq.mdtext</p>
+<p>current-&amp;-future-development-topics.mdtext</p>
+<p>how-to\'s.mdtext</p>
+<p>install-&amp;-configure-cygwin-sshd.mdtext</p>
+<p>meeting-&amp;-conference-call-notes.mdtext</p>
+<p>phpmyadmin-installation-&amp;-configuration.mdtext</p>
+<p>place-holder-for-vcl-2.4-(unreleased).mdtext</p>
+<p>resource-grouping-&amp;-mapping.mdtext</p>
+<p>upgrade-from-previous-version-(2.1-to-2.2.1).mdtext</p>
+<p>upgrade-from-previous-version-(2.1-to-2.3).mdtext</p>
+<p>upgrade-from-previous-version-(2.2.1-to-2.3).mdtext</p>
+<p>upgrade-from-previous-version-(2.2-to-2.2.1).mdtext</p>
+<p>upgrade-from-previous-version-(2.2-to-2.3).mdtext</p>
+<p>vcl-2.2.1-phpmyadmin-installation-&amp;-configuration.mdtext</p>
+<p>vcl-2.3-phpmyadmin-installation-&amp;-configuration.mdtext</p>
+<p>vmware-configuration-(2.2.1-and-below).mdtext</p>
+<p>database.mdtext</p>
+<p>apache-vcl-community.mdtext</p>
+<p>code-documentation.mdtext</p>
+<p>design-considerations.mdtext</p>
+<p>development-environment-tips.mdtext</p>
+<p>development.mdtext</p>
   </div>
   
   <div id="footer">



Mime
View raw message