[Pkg-puppet-devel] [facter] 26/180: (FACT-375) Update acceptance configs for Debian/Ubuntu

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 1d75e488f7530be3c10d86de5dce2d42705f2524
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Mon Mar 17 15:13:22 2014 -0700

    (FACT-375) Update acceptance configs for Debian/Ubuntu
---
 acceptance/config/nodes/lucid.yaml                   | 18 ++++++++----------
 acceptance/config/nodes/{lucid.yaml => precise.yaml} | 18 ++++++++----------
 acceptance/config/nodes/{lucid.yaml => squeeze.yaml} | 18 ++++++++----------
 acceptance/config/nodes/{lucid.yaml => wheezy.yaml}  | 18 ++++++++----------
 4 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/acceptance/config/nodes/lucid.yaml b/acceptance/config/nodes/lucid.yaml
index acf780d..a9074eb 100644
--- a/acceptance/config/nodes/lucid.yaml
+++ b/acceptance/config/nodes/lucid.yaml
@@ -1,22 +1,20 @@
 HOSTS:
-  ubuntu-1004-64-1:
+  master:
     roles:
       - master
-      - database
       - agent
-    platform: ubuntu-10.04-amd64
-    template: ubuntu-1004-x86_64
+    platform: ubuntu-lucid-x86_64
     hypervisor: vcloud
-  ubuntu-1004-32-1:
+    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64
+  agent:
     roles:
       - agent
-    platform: ubuntu-10.04-i386
-    template: ubuntu-1004-i386
+    platform: ubuntu-lucid-i386
     hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-i386
 CONFIG:
-  nfs_server: none
-  consoleport: 443
+  filecount: 12
   datastore: instance0
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/lucid.yaml b/acceptance/config/nodes/precise.yaml
similarity index 54%
copy from acceptance/config/nodes/lucid.yaml
copy to acceptance/config/nodes/precise.yaml
index acf780d..22793b5 100644
--- a/acceptance/config/nodes/lucid.yaml
+++ b/acceptance/config/nodes/precise.yaml
@@ -1,22 +1,20 @@
 HOSTS:
-  ubuntu-1004-64-1:
+  master:
     roles:
       - master
-      - database
       - agent
-    platform: ubuntu-10.04-amd64
-    template: ubuntu-1004-x86_64
+    platform: ubuntu-precise-x86_64
     hypervisor: vcloud
-  ubuntu-1004-32-1:
+    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64
+  agent:
     roles:
       - agent
-    platform: ubuntu-10.04-i386
-    template: ubuntu-1004-i386
+    platform: ubuntu-precise-i386
     hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-i386
 CONFIG:
-  nfs_server: none
-  consoleport: 443
+  filecount: 12
   datastore: instance0
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/lucid.yaml b/acceptance/config/nodes/squeeze.yaml
similarity index 55%
copy from acceptance/config/nodes/lucid.yaml
copy to acceptance/config/nodes/squeeze.yaml
index acf780d..d78609f 100644
--- a/acceptance/config/nodes/lucid.yaml
+++ b/acceptance/config/nodes/squeeze.yaml
@@ -1,22 +1,20 @@
 HOSTS:
-  ubuntu-1004-64-1:
+  master:
     roles:
       - master
-      - database
       - agent
-    platform: ubuntu-10.04-amd64
-    template: ubuntu-1004-x86_64
+    platform: debian-squeeze-x86_64
     hypervisor: vcloud
-  ubuntu-1004-32-1:
+    template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64
+  agent:
     roles:
       - agent
-    platform: ubuntu-10.04-i386
-    template: ubuntu-1004-i386
+    platform: debian-squeeze-i386
     hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/debian-6-i386
 CONFIG:
-  nfs_server: none
-  consoleport: 443
+  filecount: 12
   datastore: instance0
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/lucid.yaml b/acceptance/config/nodes/wheezy.yaml
similarity index 55%
copy from acceptance/config/nodes/lucid.yaml
copy to acceptance/config/nodes/wheezy.yaml
index acf780d..e805be6 100644
--- a/acceptance/config/nodes/lucid.yaml
+++ b/acceptance/config/nodes/wheezy.yaml
@@ -1,22 +1,20 @@
 HOSTS:
-  ubuntu-1004-64-1:
+  master:
     roles:
       - master
-      - database
       - agent
-    platform: ubuntu-10.04-amd64
-    template: ubuntu-1004-x86_64
+    platform: debian-wheezy-x86_64
     hypervisor: vcloud
-  ubuntu-1004-32-1:
+    template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64
+  agent:
     roles:
       - agent
-    platform: ubuntu-10.04-i386
-    template: ubuntu-1004-i386
+    platform: debian-wheezy-i386
     hypervisor: vcloud
+    template: Delivery/Quality Assurance/Templates/vCloud/debian-7-i386
 CONFIG:
-  nfs_server: none
-  consoleport: 443
+  filecount: 12
   datastore: instance0
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vcloud.delivery.puppetlabs.net/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git