pf-tools/pf-tools: 5 new changesets

[parmelan-guest at users.alioth.debian.org]

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/eadc79c4ceec
changeset: 1419:eadc79c4ceec
user:      shad
date:      Wed Dec 31 11:22:23 2014 +0100
description:
update some template and conf

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/1c5e858f7a25
changeset: 1420:1c5e858f7a25
user:      shad
date:      Wed Dec 31 11:22:46 2014 +0100
description:
translate cmdline

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/e2b30e47c961
changeset: 1421:e2b30e47c961
user:      shad
date:      Wed Dec 31 11:25:45 2014 +0100
description:
pull the repository (needed in case of rspawn)

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/596c247ca2b9
changeset: 1422:596c247ca2b9
user:      shad
date:      Wed Dec 31 13:11:37 2014 +0100
description:
changelog

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/60907fe0b548
changeset: 1423:60907fe0b548
user:      shad
date:      Wed Dec 31 15:35:28 2014 +0100
description:
adapt regex for rspawn

diffstat:

 conf/pf-tools.conf                |   9 ++-------
 debian/changelog                  |   7 +++++++
 lib/PFTools/Compat/Translation.pm |   7 +++++++
 lib/PFTools/Conf/Syntax.pm        |   2 +-
 lib/PFTools/VCS/HG.pm             |  15 ++++++++++++++-
 templates/standard-installer      |   2 +-
 templates/ubuntu-installer        |   2 +-
 7 files changed, 33 insertions(+), 11 deletions(-)

diffs (111 lines):

diff -r 1371d13f83b5 -r 60907fe0b548 conf/pf-tools.conf
--- a/conf/pf-tools.conf	Wed Dec 24 11:29:12 2014 +0100
+++ b/conf/pf-tools.conf	Wed Dec 31 15:35:28 2014 +0100
@@ -40,13 +40,8 @@
 
 [location]
     site            = pro1
-    zone            = private
-    foo             = bar
-
-[foo]
-    ignored         = 1
 
 [regex]
-#   deploy_hosts = '(deploy|[a-z]{3}\d-(?:rdeploy|spawn))'
-    hostname_model = (?<HOSTTYPE>((?<POPNAME>[a-z]{3}\d{1})-)?([a-z0-9-]+[a-z0-9-]+))%*_*
+#   deploy_hosts = (deploy|[a-z]{3}\d-(?:rdeploy|r?spawn))
+    hostname_model = (?<HOSTTYPE>((?<POPNAME>[a-z]{3}\d{1})-)?(?<SHORTHOSTTYPE>[a-z0-9-]+[a-z0-9-]+))%*_*
 
diff -r 1371d13f83b5 -r 60907fe0b548 debian/changelog
--- a/debian/changelog	Wed Dec 24 11:29:12 2014 +0100
+++ b/debian/changelog	Wed Dec 31 15:35:28 2014 +0100
@@ -1,3 +1,10 @@
+pf-tools (1.1.0-1) UNRELEASED; urgency=medium
+
+  * update templates, default conf
+  * pull repository first in case of rspawn
+
+ -- Stéphane Pontier <shad at sitadelle.com>  Wed, 31 Dec 2014 13:10:06 +0100
+
 pf-tools (1.0.1-1) unstable; urgency=low
 
   [ Thomas Parmelan ]
diff -r 1371d13f83b5 -r 60907fe0b548 lib/PFTools/Compat/Translation.pm
--- a/lib/PFTools/Compat/Translation.pm	Wed Dec 24 11:29:12 2014 +0100
+++ b/lib/PFTools/Compat/Translation.pm	Wed Dec 31 15:35:28 2014 +0100
@@ -327,6 +327,13 @@
                 $new_host->{'boot'}->{$new_key} = $host_parsed->{$key};
             }
         }
+        elsif ( $key eq 'cmdline' )
+        {
+            foreach my $cmdline ( keys %{ $host_parsed->{$key} } ) {
+                $new_host->{'boot'}->{ 'cmdline.' . $cmdline }
+                    = $host_parsed->{$key}->{$cmdline};
+            }
+        }
     }
     return $new_host;
 }
diff -r 1371d13f83b5 -r 60907fe0b548 lib/PFTools/Conf/Syntax.pm
--- a/lib/PFTools/Conf/Syntax.pm	Wed Dec 24 11:29:12 2014 +0100
+++ b/lib/PFTools/Conf/Syntax.pm	Wed Dec 31 15:35:28 2014 +0100
@@ -124,7 +124,7 @@
         [a-z]{3}\d
         -
         (?:
-            rdeploy | spawn
+            rdeploy | r?spawn
         )
     )
 }xms;
diff -r 1371d13f83b5 -r 60907fe0b548 lib/PFTools/VCS/HG.pm
--- a/lib/PFTools/VCS/HG.pm	Wed Dec 24 11:29:12 2014 +0100
+++ b/lib/PFTools/VCS/HG.pm	Wed Dec 31 15:35:28 2014 +0100
@@ -75,7 +75,20 @@
 
     if ( !$hg_cmd ) {
         if ( $hostname =~ /^$pf_config->{'regex'}->{'deploy_hosts'}/ ) {
-            $hg_cmd = q{hg clone file://};
+
+            # first update the local repository (needed in case of rspawn)
+            $hg_cmd
+                = q{hg -R /}
+                . $pf_config->{'vcs'}->{'vcsroot'} . q{/}
+                . $pf_config->{'vcs'}->{'module'}
+                . q{ pull };
+            if ( $pf_config->{'vcs'}->{'method'} eq 'ssh' ) {
+                $hg_cmd .= qq{ -e "$pf_config->{'vcs'}->{'rsh'}"};
+            }
+            $hg_cmd .= q{;};
+
+            # then clone to get the working directory
+            $hg_cmd .= q{hg clone file://};
         }
         else {
             if ( $options->{'verbose'} ) {
diff -r 1371d13f83b5 -r 60907fe0b548 templates/standard-installer
--- a/templates/standard-installer	Wed Dec 24 11:29:12 2014 +0100
+++ b/templates/standard-installer	Wed Dec 31 15:35:28 2014 +0100
@@ -9,7 +9,7 @@
 
 LABEL linux
 	kernel [% arch %]/[% kernel %]
-	append vga=normal root=/dev/sda2 [% IF initrd %]initrd=[% arch %]/[% initrd %] [% END %]-- [% console %] [% cmdline %]
+	append root=/dev/sda2 [% IF initrd %]initrd=[% arch %]/[% initrd %] [% END %]-- [% console %] [% cmdline %]
 
 PROMPT 1
 TIMEOUT 100
diff -r 1371d13f83b5 -r 60907fe0b548 templates/ubuntu-installer
--- a/templates/ubuntu-installer	Wed Dec 24 11:29:12 2014 +0100
+++ b/templates/ubuntu-installer	Wed Dec 31 15:35:28 2014 +0100
@@ -9,7 +9,7 @@
 
 LABEL linux
 	kernel [% arch %]/[% kernel %]
-	append vga=normal root=/dev/sda2 [% IF initrd %]initrd=[% arch %]/[% initrd %] [% END %]-- [% console %] [% cmdline %]
+	append vga=normal root=/dev/sda2 [% IF initrd %]initrd=[% arch %]/[% initrd %] [% END %] -- [% console %] [% cmdline %]
 
 PROMPT 1
 TIMEOUT 100