aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Séhier <simon.sehier@camptocamp.com>2015-05-26 12:43:40 +0200
committerSimon Séhier <simon.sehier@camptocamp.com>2015-05-26 12:43:40 +0200
commit764c75eea8761089c87e0cbcfe5441999f80b0eb (patch)
tree0b5b66f464c201a9cb89b479df25abf4233977fc
parentd95d4fe7648d441102436c236c44576a625c3910 (diff)
downloadpuppet-dhcp-764c75eea8761089c87e0cbcfe5441999f80b0eb.tar.gz
puppet-dhcp-764c75eea8761089c87e0cbcfe5441999f80b0eb.tar.bz2
add utopic & vivid nodesets
-rw-r--r--spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml12
-rw-r--r--spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml13
-rw-r--r--spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml12
-rw-r--r--spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml13
4 files changed, 50 insertions, 0 deletions
diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
new file mode 100644
index 0000000..f7736b5
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
@@ -0,0 +1,12 @@
+HOSTS:
+ ubuntu-1410-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: ubuntu-14.10-amd64
+ hypervisor : docker
+ image: ubuntu:14.10
+ # This stops the image from being deleted on completion, speeding up the process.
+ docker_preserve_image: true
+CONFIG:
+ type: foss
+ log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml
new file mode 100644
index 0000000..bbeded1
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml
@@ -0,0 +1,13 @@
+HOSTS:
+ ubuntu-1410-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: ubuntu-14.10-amd64
+ hypervisor : openstack
+ flavor: m1.small
+ image: ubuntu-1410-latest
+ user: ubuntu
+CONFIG:
+ type: foss
+ log_level: debug
+ openstack_network: default
diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
new file mode 100644
index 0000000..7521738
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
@@ -0,0 +1,12 @@
+HOSTS:
+ ubuntu-1504-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: ubuntu-15.04-amd64
+ hypervisor : docker
+ image: ubuntu:15.04
+ # This stops the image from being deleted on completion, speeding up the process.
+ docker_preserve_image: true
+CONFIG:
+ type: foss
+ log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml
new file mode 100644
index 0000000..d86c1e9
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml
@@ -0,0 +1,13 @@
+HOSTS:
+ ubuntu-1504-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: ubuntu-15.04-amd64
+ hypervisor : openstack
+ flavor: m1.small
+ image: ubuntu-1504-latest
+ user: ubuntu
+CONFIG:
+ type: foss
+ log_level: debug
+ openstack_network: default