openstack
/
openstack-chef
Code Issues Proposed changes

Merge "Increment CentOS release"

This commit is contained in:
Jenkins 2016-02-22 16:21:13 +00:00 committed by Gerrit Code Review
parent 783e9d9491 d275d8afa0
commit d68b66be9c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/allinone-centos7.json
View File

@ -18,7 +18,7 @@
"mq": {
"user": "admin"
},
"network":{
"network": {
"conf": {
"DEFAULT": {
"service_plugins": "router"

6
vagrant_linux.rb
View File

@ -1,7 +1,7 @@
require 'chef/provisioning/vagrant_driver'
vagrant_box 'centos7.1' do
url 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.1_chef-provisionerless.box'
vagrant_box 'centos7.2' do
url 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.2_chef-provisionerless.box'
end
vagrant_box 'ubuntu14' do
@ -9,7 +9,7 @@ vagrant_box 'ubuntu14' do
end
os = 'ubuntu14'
os = 'centos7.1' if ENV['REPO_OS'].to_s.include?('centos')
os = 'centos7.2' if ENV['REPO_OS'].to_s.include?('centos')
with_driver "vagrant:#{File.dirname(__FILE__)}/vms"
with_machine_options vagrant_options: {