Merge "Synchronize nodeset (split trusty and centos)"

This commit is contained in:
Jenkins 2015-07-08 19:25:49 +00:00 committed by Gerrit Code Review
commit bf53898d7a
5 changed files with 31 additions and 7 deletions

View File

@ -0,0 +1,11 @@
HOSTS:
centos-server-70-x64:
roles:
- master
platform: el-7-x86_64
box: puppetlabs/centos-7.0-64-nocm
box_url: https://vagrantcloud.com/puppetlabs/centos-7.0-64-nocm
hypervisor: vagrant
CONFIG:
log_level: debug
type: foss

View File

@ -1,9 +1,11 @@
HOSTS:
ubuntu-14.04-amd64:
ubuntu-server-1404-x64:
roles:
- master
platform: ubuntu-14.04-amd64
hypervisor : none
ip: 127.0.0.1
box: puppetlabs/ubuntu-14.04-64-nocm
box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
hypervisor: vagrant
CONFIG:
type: foss
log_level: debug
type: git

View File

@ -3,7 +3,7 @@ HOSTS:
roles:
- master
platform: el-7-x86_64
hypervisor : none
hypervisor: none
ip: 127.0.0.1
CONFIG:
type: foss

View File

@ -1,9 +1,9 @@
HOSTS:
ubuntu-14.04-amd64:
ubuntu-1404-x64:
roles:
- master
platform: ubuntu-14.04-amd64
hypervisor : none
hypervisor: none
ip: 127.0.0.1
CONFIG:
type: foss

View File

@ -0,0 +1,11 @@
HOSTS:
ubuntu-server-1404-x64:
roles:
- master
platform: ubuntu-14.04-amd64
box: puppetlabs/ubuntu-14.04-64-nocm
box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
hypervisor: vagrant
CONFIG:
log_level: debug
type: git