openstack
/
openstack-chef-repo
Code Issues Proposed changes

Updates for Liberty 

Changed a few references from kilo to liberty

Change-Id: I1cd083712aa869f0b4291a23096fead195e7993d
This commit is contained in:
JJ Asghar 2015-08-27 17:01:01 -05:00
parent 6f2718a65b
commit ee980c55bf
4 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -5,7 +5,7 @@ that you can still build a cluster from the ground up with any changes we push u
This framework also gives us an opportunity to show different Reference Architectures and a sane example on how to start with OpenStack and Chef.
With the `master` branch of the cookbooks, which is currently tied to the base OpenStack Kilo release, this supports deploying to Ubuntu 14.04 and CentOS 7.1 for all-in-one with nova-network. Support for all-in-one with Neutron, and multi-node support, is a work in progress.
With the `master` branch of the cookbooks, which is currently tied to the base OpenStack Liberty release, this supports deploying to Ubuntu 14.04 and CentOS 7.1 for all-in-one with nova-network. Support for all-in-one with Neutron, and multi-node support, is a work in progress.
Support for CentOS 6.5 and Ubuntu 12.04 with Icehouse is available with the stable/icehouse branch of this project.

46
environments/example.rb
View File

@ -1,46 +0,0 @@
name 'example'
description('Example environment defineing the network and database ' \
"settings you're going to use with OpenStack. " \
'The networks will be used in the libraries provided by ' \
'the osops-utils cookbook. This example is for ' \
'FlatDHCP with 2 physical networks.')
override_attributes(
'mysql' => {
'allow_remote_root' => true,
'root_network_acl' => '%'
},
'openstack' => {
'developer_mode' => true
}
# 'glance' => {
# 'images' => ['precise','cirros'],
# 'image' => {
# 'cirros' => 'http://hypnotoad/cirros-0.3.0-x86_64-disk.img',
# 'precise' => 'http://hypnotoad/precise-server-cloudimg-amd64.tar.gz'
# }
# },
# 'osops_networks' => {
# 'public' => '10.0.111.0/24',
# 'management' => '10.0.111.0/24',
# 'nova' => '10.0.111.0/24'
# },
# 'nova' => {
# 'network' => {
# 'fixed_range' => '192.168.100.0/24',
# 'public_interface' => 'eth0'
# },
# 'networks' => [
# {
# 'label' => 'public',
# 'ipv4_cidr' => '192.168.100.0/24',
# 'num_networks' => '1',
# 'network_size' => '255',
# 'bridge' => 'br100',
# 'bridge_dev' => 'eth0',
# 'dns1' => '8.8.8.8',
# 'dns2' => '8.8.4.4'
# }
# ]
# }
)

4
environments/vagrant-multi-nova.json
View File

@ -10,7 +10,7 @@
"override_attributes": {
"yum": {
"repo": {
"baseurl": "https://repos.fedorapeople.org/repos/openstack/openstack-kilo/epel-7"
"baseurl": "https://repos.fedorapeople.org/repos/openstack/openstack-liberty/epel-7"
},
"epel": {
"mirrorlist": "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=$basearch",
@ -26,7 +26,7 @@
"user": "admin"
},
"yum": {
"uri": "https://repos.fedorapeople.org/repos/openstack/openstack-kilo/epel-7"
"uri": "https://repos.fedorapeople.org/repos/openstack/openstack-liberty/epel-7"
},
"identity": {
"bind_interface": "eth1"

4
tools/test_patch.rb
View File

@ -17,7 +17,7 @@ end
# rubocop:disable LineLength
def run(command, verbose = true) # rubocop:disable Metrics/MethodLength
def run(command, verbose = true)
puts "## Running command: [#{Dir.pwd}] $ #{command}"
live_stream = STDOUT
live_stream = nil unless verbose
@ -48,7 +48,7 @@ def get_patch_info(user, patch) # rubocop:disable Metrics/MethodLength
else
patch_info = run("ssh -p 29418 #{user}@review.openstack.org gerrit query --current-patch-set #{patch}", false)
end
/^\s*project: openstack\/(?<patch_project>.*)$/i =~ patch_info
%r{^\s*project: openstack\/(?<patch_project>.*)$}i =~ patch_info
/^\s*ref: (?<patch_ref>.*)$/i =~ patch_info
abort "Error! Patch: #{patch} not valid" if patch_project.nil?
patch_cookbook = patch_project.gsub('cookbook-', '')