openstack/openstack-chef-repo
Code Issues Proposed changes

Increment CentOS release

Browse Source 
* 7.2 image is available upstream

Change-Id: I5266bfd32d90969c640b4af1e5a96dad249480c5
This commit is contained in:
Samuel Cassiba 2016-02-16 22:06:54 -08:00
parent 481af2f96a
commit d275d8afa0
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": { "mq": {
"user": "admin" "user": "admin"
}, },
"network":{ "network": {
"conf": { "conf": {
"DEFAULT": { "DEFAULT": {
"service_plugins": "router" "service_plugins": "router"

6
vagrant_linux.rb
View File

@ -1,7 +1,7 @@
require 'chef/provisioning/vagrant_driver' require 'chef/provisioning/vagrant_driver'
vagrant_box 'centos7.1' do vagrant_box 'centos7.2' do
url 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.1_chef-provisionerless.box' url 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.2_chef-provisionerless.box'
end end
vagrant_box 'ubuntu14' do vagrant_box 'ubuntu14' do
@ -9,7 +9,7 @@ vagrant_box 'ubuntu14' do
end end
os = 'ubuntu14' 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_driver "vagrant:#{File.dirname(__FILE__)}/vms"
with_machine_options vagrant_options: { with_machine_options vagrant_options: {