openstack
/
openstack-chef
Code Issues Proposed changes

Update rabbitmq and ubuntu versions 

Reasons:
 - Rabbitmq cookbook in 3.0.4 return the following error:
 Error executing action `enable` on resource
 'rabbitmq_plugin[rabbitmq_management]'
 - Ubuntu 12.04 isn't the latest LTS version

Changes:
 - Update Rabbitmq cookbook to 3.10.0 in Berksfile
 - Change all occurences from 1204 or 12.04 to 1404 and 14.04

Change-Id: I364cb53cc73e567760d72e49df0e15105a66f2c7
This commit is contained in:
Pierre RAMBAUD 2015-02-11 15:21:29 +01:00
parent 9ce35810b7
commit 28b6929bb2
6 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Berksfile
View File

@ -12,7 +12,7 @@ cookbook 'mysql-chef_gem', '0.0.4'
cookbook 'openssl', '1.1.0'
cookbook 'postgresql', '3.3.4'
cookbook 'python', '1.4.6'
cookbook 'rabbitmq', '3.0.4'
cookbook 'rabbitmq', '3.10.0'
cookbook 'xfs', '1.1.0'
cookbook 'yum', '3.1.4'
cookbook 'selinux', '0.7.2'

8
TESTING.md
View File

@ -2,7 +2,7 @@
## Prerequisites ##
The allinone-compute role may be tested with Vagrant, currently with Ubuntu 12.04. You need the following prerequisites:
The allinone-compute role may be tested with Vagrant, currently with Ubuntu 14.04. You need the following prerequisites:
1. You must have Vagrant 1.2.1 or later installed.
2. You must have a "sane" Ruby 1.9.3 environment.
@ -36,9 +36,9 @@ Set an environment file to specify which Vagrantfile to use, for example:
## Starting the allinone-compute node ##
To test with Ubuntu 12.04, run:
To test with Ubuntu 14.04, run:
$ vagrant up ubuntu1204
$ vagrant up ubuntu1404
## Further testing ##
@ -46,7 +46,7 @@ Now you have an openstack, you'll probably want to be able to actually launch in
### Log into box, prepare environment ###
$ vagrant ssh ubuntu1204
$ vagrant ssh ubuntu1404
$ sudo bash
$ source /root/openrc

6
Vagabondfile
View File

@ -1,7 +1,7 @@
{
:nodes => {
:ops => {
:template => "ubuntu_1204",
:template => "ubuntu_1404",
:ipaddress => "10.0.3.10",
:environment => "testing",
:run_list => [
@ -12,7 +12,7 @@
]
},
:controller => {
:template => "ubuntu_1204",
:template => "ubuntu_1404",
:ipaddress => "10.0.3.11",
:environment => "testing",
:run_list => [
@ -28,7 +28,7 @@
]
},
:compute => {
:template => "ubuntu_1204",
:template => "ubuntu_1404",
:ipaddress => "10.0.3.12",
:environment => "testing",
:run_list => [

26
Vagrantfile-aio-neutron
View File

@ -5,7 +5,7 @@
# and then use as normal:
# vagrant up centos65
# AND/OR
# vagrant up ubuntu1204
# vagrant up ubuntu1404
Vagrant.require_version ">= 1.1"
@ -43,25 +43,25 @@ Vagrant.configure("2") do |config|
end
#######################
# Ubuntu 12.04 #
# Ubuntu 14.04 #
#######################
config.vm.define :ubuntu1204 do |ubuntu1204|
config.vm.define :ubuntu1404 do |ubuntu1404|
ubuntu1204.vm.hostname = "ubuntu1204"
ubuntu1404.vm.hostname = "ubuntu1404"
ubuntu1204.vm.box = "opscode-ubuntu-12.04"
ubuntu1404.vm.box = "opscode-ubuntu-14.04"
ubuntu1204.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box"
ubuntu1404.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box"
ubuntu1204.vm.network "forwarded_port", guest: 443, host: 8443 # dashboard-ssl
ubuntu1204.vm.network "forwarded_port", guest: 5000, host: 5000 # identity-api
ubuntu1204.vm.network "forwarded_port", guest: 8773, host: 8773 # compute-ec2-api
ubuntu1204.vm.network "forwarded_port", guest: 8774, host: 8774 # compute-api
ubuntu1204.vm.network "forwarded_port", guest: 4002, host: 4002 # chef-zero
ubuntu1204.vm.network "forwarded_port", guest: 35357, host: 35357 # identity-admin-api
ubuntu1404.vm.network "forwarded_port", guest: 443, host: 8443 # dashboard-ssl
ubuntu1404.vm.network "forwarded_port", guest: 5000, host: 5000 # identity-api
ubuntu1404.vm.network "forwarded_port", guest: 8773, host: 8773 # compute-ec2-api
ubuntu1404.vm.network "forwarded_port", guest: 8774, host: 8774 # compute-api
ubuntu1404.vm.network "forwarded_port", guest: 4002, host: 4002 # chef-zero
ubuntu1404.vm.network "forwarded_port", guest: 35357, host: 35357 # identity-admin-api
ubuntu1204.vm.provision :chef_client do |chef|
ubuntu1404.vm.provision :chef_client do |chef|
chef.environment = chef_environment
chef.run_list = chef_run_list.unshift("recipe[apt::cacher-client]")
chef.chef_server_url = "http://#{local_ip}:4002"

28
Vagrantfile-aio-nova
View File

@ -5,7 +5,7 @@
# and then use as normal:
# vagrant up centos65
# AND/OR
# vagrant up ubuntu1204
# vagrant up ubuntu1404
Vagrant.require_version ">= 1.1"
@ -43,29 +43,29 @@ Vagrant.configure("2") do |config|
end
#######################
# Ubuntu 12.04 #
# Ubuntu 14.04 #
#######################
config.vm.define :ubuntu1204 do |ubuntu1204|
config.vm.define :ubuntu1404 do |ubuntu1404|
ubuntu1204.vm.hostname = "ubuntu1204"
ubuntu1404.vm.hostname = "ubuntu1404"
ubuntu1204.vm.box = "opscode-ubuntu-12.04"
ubuntu1404.vm.box = "opscode-ubuntu-14.04"
ubuntu1204.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box"
ubuntu1404.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box"
ubuntu1204.vm.provider "virtualbox" do |vb|
ubuntu1404.vm.provider "virtualbox" do |vb|
vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
end
ubuntu1204.vm.network "forwarded_port", guest: 443, host: 8443 # dashboard-ssl
ubuntu1204.vm.network "forwarded_port", guest: 4002, host: 4002 # chef-zero
ubuntu1204.vm.network "forwarded_port", guest: 5000, host: 5000 # identity-api
ubuntu1204.vm.network "forwarded_port", guest: 8773, host: 8773 # compute-ec2-api
ubuntu1204.vm.network "forwarded_port", guest: 8774, host: 8774 # compute-api
ubuntu1204.vm.network "forwarded_port", guest: 35357, host: 35357 # identity-admin-api
ubuntu1404.vm.network "forwarded_port", guest: 443, host: 8443 # dashboard-ssl
ubuntu1404.vm.network "forwarded_port", guest: 4002, host: 4002 # chef-zero
ubuntu1404.vm.network "forwarded_port", guest: 5000, host: 5000 # identity-api
ubuntu1404.vm.network "forwarded_port", guest: 8773, host: 8773 # compute-ec2-api
ubuntu1404.vm.network "forwarded_port", guest: 8774, host: 8774 # compute-api
ubuntu1404.vm.network "forwarded_port", guest: 35357, host: 35357 # identity-admin-api
ubuntu1204.vm.provision :chef_client do |chef|
ubuntu1404.vm.provision :chef_client do |chef|
chef.environment = chef_environment
chef.run_list = chef_run_list.unshift("recipe[apt::cacher-client]")
chef.chef_server_url = "http://#{local_ip}:4002"

40
Vagrantfile-multi-neutron
View File

@ -5,7 +5,7 @@
# and then use as normal:
# vagrant up /centos65/
# OR
# vagrant up /ubuntu1204/
# vagrant up /ubuntu1404/
# will boot the controller and compute node
#
# NOTE: due to needing to specify IP's in the environment, you can only run
@ -53,24 +53,24 @@ Vagrant.configure("2") do |config|
end
#################################
# Ubuntu 12.04 controller #
# Ubuntu 14.04 controller #
#################################
config.vm.define :ubuntu1204cont do |ubuntu1204cont|
config.vm.define :ubuntu1404cont do |ubuntu1404cont|
ubuntu1204cont.vm.hostname = "ubuntu1204cont"
ubuntu1404cont.vm.hostname = "ubuntu1404cont"
ubuntu1204cont.vm.box = "opscode-ubuntu-12.04"
ubuntu1404cont.vm.box = "opscode-ubuntu-14.04"
ubuntu1204cont.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box"
ubuntu1404cont.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box"
ubuntu1204cont.vm.network "forwarded_port", guest: 443, host: 8443 # dashboard-ssl
ubuntu1204cont.vm.network "forwarded_port", guest: 8773, host: 8773 # compute-ec2-api
ubuntu1204cont.vm.network "forwarded_port", guest: 8774, host: 8774 # compute-api
ubuntu1204cont.vm.network "private_network", ip: "192.168.3.60"
ubuntu1204cont.vm.network "private_network", ip: "172.16.10.60"
ubuntu1404cont.vm.network "forwarded_port", guest: 443, host: 8443 # dashboard-ssl
ubuntu1404cont.vm.network "forwarded_port", guest: 8773, host: 8773 # compute-ec2-api
ubuntu1404cont.vm.network "forwarded_port", guest: 8774, host: 8774 # compute-api
ubuntu1404cont.vm.network "private_network", ip: "192.168.3.60"
ubuntu1404cont.vm.network "private_network", ip: "172.16.10.60"
ubuntu1204cont.vm.provision :chef_client do |chef|
ubuntu1404cont.vm.provision :chef_client do |chef|
chef.run_list = controller_run_list
chef.environment = chef_environment
chef.chef_server_url = "http://#{local_ip}:4001"
@ -78,21 +78,21 @@ Vagrant.configure("2") do |config|
end
#################################
# Ubuntu 12.04 compute1 #
# Ubuntu 14.04 compute1 #
#################################
config.vm.define :ubuntu1204comp1 do |ubuntu1204comp1|
config.vm.define :ubuntu1404comp1 do |ubuntu1404comp1|
ubuntu1204comp1.vm.hostname = "ubuntu1204comp1"
ubuntu1404comp1.vm.hostname = "ubuntu1404comp1"
ubuntu1204comp1.vm.box = "opscode-ubuntu-12.04"
ubuntu1404comp1.vm.box = "opscode-ubuntu-14.04"
ubuntu1204comp1.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box"
ubuntu1404comp1.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box"
ubuntu1204comp1.vm.network "private_network", ip: "192.168.3.61"
ubuntu1204comp1.vm.network "private_network", ip: "172.16.10.61"
ubuntu1404comp1.vm.network "private_network", ip: "192.168.3.61"
ubuntu1404comp1.vm.network "private_network", ip: "172.16.10.61"
ubuntu1204comp1.vm.provision :chef_client do |chef|
ubuntu1404comp1.vm.provision :chef_client do |chef|
chef.run_list = [ "role[os-compute-worker]","recipe[apt::cacher-client]" ]
chef.environment = chef_environment
chef.chef_server_url = "http://#{local_ip}:4001"