pf-tools/pf-tools: 2 new changesets
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Thu Dec 11 16:52:40 UTC 2014
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/f933c6815cf4
changeset: 1376:f933c6815cf4
user: shad
date: Thu Dec 11 17:51:06 2014 +0100
description:
fix test of cbv4-pfds-filer where a space at the end of value prevented
several dns entry to be generated
added definition of a filer using ALL site and one using several site to
prepare some test on ADDMOUNT
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/54f8650d8120
changeset: 1377:54f8650d8120
user: shad
date: Thu Dec 11 17:52:36 2014 +0100
description:
merge melkor's commit
diffstat:
lib/PFTools/Update/ADDFILE.pm | 3 +
t/13.conf.cfg1/config-export/COMMON/private-network | 20 +-
t/13.conf.t | 264 +++++++++++++++++++-
t/20.files.t | 25 +
4 files changed, 309 insertions(+), 3 deletions(-)
diffs (442 lines):
diff -r fcb2cb3c461b -r 54f8650d8120 lib/PFTools/Update/ADDFILE.pm
--- a/lib/PFTools/Update/ADDFILE.pm Wed Dec 10 16:56:14 2014 +0100
+++ b/lib/PFTools/Update/ADDFILE.pm Thu Dec 11 17:52:36 2014 +0100
@@ -153,6 +153,9 @@
}
}
}
+ elsif ($ref_section->{'source'} =~ m{\AAUTO:(.*)\z}xms ) {
+ $source = __find_source( $options, $hash_subst, [$1] );
+ }
else {
$source = get_source( $ref_section->{'source'},
$options->{'host'}, $hash_subst );
diff -r fcb2cb3c461b -r 54f8650d8120 t/13.conf.cfg1/config-export/COMMON/private-network
--- a/t/13.conf.cfg1/config-export/COMMON/private-network Wed Dec 10 16:56:14 2014 +0100
+++ b/t/13.conf.cfg1/config-export/COMMON/private-network Thu Dec 11 17:52:36 2014 +0100
@@ -61,7 +61,25 @@
order = 2
number = 2
ipv4.vlan-systeme = 2.0
- shortname = vlan-systeme
+ shortname = vlan-systeme
+
+[filer-all%%]
+ type = server
+ site = ALL
+ comment = filer with ip common on all site
+ order = 2
+ number = 2
+ ipv4.vlan-systeme = 2.10
+ shortname = vlan-systeme
+
+[filer-several%%]
+ type = server
+ site = cbv4-pfds, cbv4
+ comment = filer with ip common on several site
+ order = 2
+ number = 2
+ ipv4.vlan-systeme = 2.20
+ shortname = vlan-systeme
[COMMON:/network-common]
type = include
diff -r fcb2cb3c461b -r 54f8650d8120 t/13.conf.t
--- a/t/13.conf.t Wed Dec 10 16:56:14 2014 +0100
+++ b/t/13.conf.t Thu Dec 11 17:52:36 2014 +0100
@@ -521,6 +521,8 @@
'cbv4',
'vip-spawn',
'cbv4-pfds-filer%%',
+ 'filer-all%%',
+ 'filer-several%%',
'vlan-systeme',
'vlan-pfds-int',
'vlan-public',
@@ -572,10 +574,28 @@
'ipv4.vlan-systeme' => '2.0',
'number' => '2',
'order' => '2',
- 'shortname' => 'vlan-systeme ',
+ 'shortname' => 'vlan-systeme',
'site' => 'cbv4-pfds',
'type' => 'server',
},
+ 'filer-all%%' => {
+ 'comment' => 'filer with ip common on all site',
+ 'ipv4.vlan-systeme' => '2.10',
+ 'number' => '2',
+ 'order' => '2',
+ 'shortname' => 'vlan-systeme',
+ 'site' => 'ALL',
+ 'type' => 'server',
+ },
+ 'filer-several%%' => {
+ 'comment' => 'filer with ip common on several site',
+ 'ipv4.vlan-systeme' => '2.20',
+ 'number' => '2',
+ 'order' => '2',
+ 'shortname' => 'vlan-systeme',
+ 'site' => 'cbv4-pfds, cbv4',
+ 'type' => 'server',
+ },
'private' => {
'@mx' => [
'1 mf.private.',
@@ -1065,8 +1085,64 @@
'order' => '2',
'hostname_model' => 'cbv4-pfds-filer%%'
}
+ }
+ },
+ 'filer-all' => {
+ 'filer-all01' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.11/16',
+ 'vlan' => 'vlan-systeme'
+ }
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-all',
+ 'order' => '2',
+ 'hostname_model' => 'filer-all%%'
+ }
+ },
+ 'filer-all00' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.10/16',
+ 'vlan' => 'vlan-systeme'
+ }
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-all',
+ 'order' => '2',
+ 'hostname_model' => 'filer-all%%'
}
}
+ },
+ 'filer-several' => {
+ 'filer-several01' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.21/16',
+ 'vlan' => 'vlan-systeme'
+ }
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-several',
+ 'order' => '2',
+ 'hostname_model' => 'filer-several%%'
+ }
+ },
+ 'filer-several00' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.20/16',
+ 'vlan' => 'vlan-systeme'
+ }
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-several',
+ 'order' => '2',
+ 'hostname_model' => 'filer-several%%'
+ }
+ }
+ },
},
'__hostclass_pxe' => [
'cbv4-spawn'
@@ -1077,6 +1153,10 @@
'10.3.2.41/24' => 'cbv4-spawn00.vlan-middledsi',
'10.1.2.1/16' => 'cbv4-pfds-filer01.vlan-systeme',
'10.1.2.0/16' => 'cbv4-pfds-filer00.vlan-systeme',
+ '10.1.2.10/16' => 'filer-all00.vlan-systeme',
+ '10.1.2.11/16' => 'filer-all01.vlan-systeme',
+ '10.1.2.20/16' => 'filer-several00.vlan-systeme',
+ '10.1.2.21/16' => 'filer-several01.vlan-systeme',
'10.3.1.1/24' => 'cbv4-spawn01.vlan-admindsi',
'192.168.1.99/24' => 'vip-spawn.vlan-pfds-ext',
'10.1.167.0/16' => 'cbv4-spawn00.vlan-systeme',
@@ -1279,11 +1359,71 @@
'spawn00' => 'cbv4-rdeploy00',
'spawn' => 'cbv4-rdeploy',
},
+ 'filer-several' => {
+ 'filer-several01' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.21/16',
+ 'vlan' => 'vlan-systeme'
+ },
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-several',
+ 'order' => '2',
+ 'hostname_model' => 'filer-several%%'
+ }
+ },
+ 'filer-several00' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.20/16',
+ 'vlan' => 'vlan-systeme',
+ },
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-several',
+ 'order' => '2',
+ 'hostname_model' => 'filer-several%%'
+ }
+ },
+ },
+ 'filer-all' => {
+ 'filer-all01' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.11/16',
+ 'vlan' => 'vlan-systeme'
+ },
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-all',
+ 'order' => '2',
+ 'hostname_model' => 'filer-all%%'
+ }
+ },
+ 'filer-all00' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.10/16',
+ 'vlan' => 'vlan-systeme',
+ },
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-all',
+ 'order' => '2',
+ 'hostname_model' => 'filer-all%%'
+ }
+ },
+ },
},
'__hostclass_pxe' => [
'cbv4-rdeploy',
],
'BY_ADDR' => {
+ '10.1.2.10/16' => 'filer-all00.vlan-systeme',
+ '10.1.2.11/16' => 'filer-all01.vlan-systeme',
+ '10.1.2.20/16' => 'filer-several00.vlan-systeme',
+ '10.1.2.21/16' => 'filer-several01.vlan-systeme',
'10.1.167.0/16' => 'cbv4-rdeploy00.vlan-systeme',
'10.1.167.1/16' => 'cbv4-rdeploy01.vlan-systeme',
'80.125.163.42/24' => 'cbv4-rdeploy00.vlan-public',
@@ -1426,6 +1566,8 @@
'__hostclass_order' => [
'vip-spawn',
'cbv4-pfds-filer',
+ 'filer-all',
+ 'filer-several',
'cbv4-spawn',
],
'__network_order' => [
@@ -1492,6 +1634,9 @@
'comment' => 'Spawning server',
},
'cbv4-pfds-filer' => {
+ 'cbv4-pfds-filer' => 'CNAME cbv4-pfds-filer.vlan-systeme',
+ 'cbv4-pfds-filer00' => 'CNAME cbv4-pfds-filer00.vlan-systeme',
+ 'cbv4-pfds-filer01' => 'CNAME cbv4-pfds-filer01.vlan-systeme',
'cbv4-pfds-filer00.vlan-systeme' => 'A 10.1.2.0',
'cbv4-pfds-filer01.vlan-systeme' => 'A 10.1.2.1',
'number' => 2,
@@ -1501,6 +1646,32 @@
'A 10.1.2.1',
],
},
+ 'filer-all' => {
+ 'filer-all' => 'CNAME filer-all.vlan-systeme',
+ 'filer-all00' => 'CNAME filer-all00.vlan-systeme',
+ 'filer-all01' => 'CNAME filer-all01.vlan-systeme',
+ 'filer-all00.vlan-systeme' => 'A 10.1.2.10',
+ 'filer-all01.vlan-systeme' => 'A 10.1.2.11',
+ 'number' => 2,
+ 'comment' => 'filer with ip common on all site',
+ 'filer-all.vlan-systeme' => [
+ 'A 10.1.2.10',
+ 'A 10.1.2.11',
+ ],
+ },
+ 'filer-several' => {
+ 'filer-several' => 'CNAME filer-several.vlan-systeme',
+ 'filer-several00' => 'CNAME filer-several00.vlan-systeme',
+ 'filer-several01' => 'CNAME filer-several01.vlan-systeme',
+ 'filer-several00.vlan-systeme' => 'A 10.1.2.20',
+ 'filer-several01.vlan-systeme' => 'A 10.1.2.21',
+ 'number' => 2,
+ 'comment' => 'filer with ip common on several site',
+ 'filer-several.vlan-systeme' => [
+ 'A 10.1.2.20',
+ 'A 10.1.2.21',
+ ],
+ },
'vlan-systeme' => {
'broadcast' => 'A 10.1.255.255',
'network' => 'A 10.1.0.0',
@@ -1523,6 +1694,8 @@
},
'cbv4' => {
'__hostclass_order' => [
+ 'filer-all',
+ 'filer-several',
'cbv4-rdeploy',
],
'__network_order' => [
@@ -1560,6 +1733,32 @@
'number' => 2,
'comment' => 'Rdeploy server',
},
+ 'filer-all' => {
+ 'filer-all' => 'CNAME filer-all.vlan-systeme',
+ 'filer-all00' => 'CNAME filer-all00.vlan-systeme',
+ 'filer-all01' => 'CNAME filer-all01.vlan-systeme',
+ 'filer-all00.vlan-systeme' => 'A 10.1.2.10',
+ 'filer-all01.vlan-systeme' => 'A 10.1.2.11',
+ 'number' => 2,
+ 'comment' => 'filer with ip common on all site',
+ 'filer-all.vlan-systeme' => [
+ 'A 10.1.2.10',
+ 'A 10.1.2.11',
+ ],
+ },
+ 'filer-several' => {
+ 'filer-several' => 'CNAME filer-several.vlan-systeme',
+ 'filer-several00' => 'CNAME filer-several00.vlan-systeme',
+ 'filer-several01' => 'CNAME filer-several01.vlan-systeme',
+ 'filer-several00.vlan-systeme' => 'A 10.1.2.20',
+ 'filer-several01.vlan-systeme' => 'A 10.1.2.21',
+ 'number' => 2,
+ 'comment' => 'filer with ip common on several site',
+ 'filer-several.vlan-systeme' => [
+ 'A 10.1.2.20',
+ 'A 10.1.2.21',
+ ],
+ },
},
},
'SOA' => {
@@ -2116,12 +2315,73 @@
'nsprivate' => 'cbv4-rdeploy',
'nsprivate00' => 'cbv4-rdeploy00',
'spawn' => 'cbv4-rdeploy'
- }
+ },
+ 'filer-all' => {
+ 'filer-all01' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.11/16',
+ 'vlan' => 'vlan-systeme'
+ },
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-all',
+ 'order' => '2',
+ 'hostname_model' => 'filer-all%%'
+ }
+ },
+ 'filer-all00' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.10/16',
+ 'vlan' => 'vlan-systeme',
+ },
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-all',
+ 'order' => '2',
+ 'hostname_model' => 'filer-all%%'
+ }
+ },
+ },
+ 'filer-several' => {
+ 'filer-several01' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.21/16',
+ 'vlan' => 'vlan-systeme'
+ },
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-several',
+ 'order' => '2',
+ 'hostname_model' => 'filer-several%%'
+ }
+ },
+ 'filer-several00' => {
+ 'interfaces' => {
+ 'eth0' => {
+ 'ipv4' => '10.1.2.20/16',
+ 'vlan' => 'vlan-systeme',
+ },
+ },
+ 'deployment' => {
+ 'hosttype' => 'filer-several',
+ 'order' => '2',
+ 'hostname_model' => 'filer-several%%'
+ }
+ },
+ },
},
+
'__hostclass_pxe' => [
'cbv4-rdeploy'
],
'BY_ADDR' => {
+ '10.1.2.10/16' => 'filer-all00.vlan-systeme',
+ '10.1.2.11/16' => 'filer-all01.vlan-systeme',
+ '10.1.2.20/16' => 'filer-several00.vlan-systeme',
+ '10.1.2.21/16' => 'filer-several01.vlan-systeme',
'10.1.167.0/16' => 'cbv4-rdeploy00.vlan-systeme',
'10.1.167.1/16' => 'cbv4-rdeploy01.vlan-systeme',
'80.125.163.42/24' => 'cbv4-rdeploy00.vlan-public',
diff -r fcb2cb3c461b -r 54f8650d8120 t/20.files.t
--- a/t/20.files.t Wed Dec 10 16:56:14 2014 +0100
+++ b/t/20.files.t Thu Dec 11 17:52:36 2014 +0100
@@ -195,11 +195,36 @@
q{; cbv4-pfds-filer: NAS for CBV4-PFDS site},
q{; number: 2},
q{;----------------------------------------------------------------------------},
+ qq{cbv4-pfds-filer\tIN CNAME\tcbv4-pfds-filer.vlan-systeme},
qq{cbv4-pfds-filer.vlan-systeme\tIN A\t10.1.2.0},
qq{cbv4-pfds-filer.vlan-systeme\tIN A\t10.1.2.1},
+ qq{cbv4-pfds-filer00\tIN CNAME\tcbv4-pfds-filer00.vlan-systeme},
qq{cbv4-pfds-filer00.vlan-systeme\tIN A\t10.1.2.0},
+ qq{cbv4-pfds-filer01\tIN CNAME\tcbv4-pfds-filer01.vlan-systeme},
qq{cbv4-pfds-filer01.vlan-systeme\tIN A\t10.1.2.1},
q{},
+ q{; filer-all: filer with ip common on all site},
+ q{; number: 2},
+ q{;----------------------------------------------------------------------------},
+ qq{filer-all\tIN CNAME\tfiler-all.vlan-systeme},
+ qq{filer-all.vlan-systeme\tIN A\t10.1.2.10},
+ qq{filer-all.vlan-systeme\tIN A\t10.1.2.11},
+ qq{filer-all00\tIN CNAME\tfiler-all00.vlan-systeme},
+ qq{filer-all00.vlan-systeme\tIN A\t10.1.2.10},
+ qq{filer-all01\tIN CNAME\tfiler-all01.vlan-systeme},
+ qq{filer-all01.vlan-systeme\tIN A\t10.1.2.11},
+ q{},
+ q{; filer-several: filer with ip common on several site},
+ q{; number: 2},
+ q{;----------------------------------------------------------------------------},
+ qq{filer-several\tIN CNAME\tfiler-several.vlan-systeme},
+ qq{filer-several.vlan-systeme\tIN A\t10.1.2.20},
+ qq{filer-several.vlan-systeme\tIN A\t10.1.2.21},
+ qq{filer-several00\tIN CNAME\tfiler-several00.vlan-systeme},
+ qq{filer-several00.vlan-systeme\tIN A\t10.1.2.20},
+ qq{filer-several01\tIN CNAME\tfiler-several01.vlan-systeme},
+ qq{filer-several01.vlan-systeme\tIN A\t10.1.2.21},
+ q{},
q{; cbv4-spawn: Spawning server},
q{; number: 2},
q{;----------------------------------------------------------------------------},
More information about the pf-tools-commits
mailing list