diff --git a/.fixtures.yml b/.fixtures.yml index e85ac2c..5df20b1 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,14 +1,32 @@ fixtures: repositories: - 'cinder': 'git://github.com/stackforge/puppet-cinder' - "keystone": "git://github.com/stackforge/puppet-keystone.git" - "nova": "git://github.com/stackforge/puppet-nova.git" - "glance": "git://github.com/stackforge/puppet-glance.git" - 'horizon': 'git://github.com/stackforge/puppet-horizon' - 'swift' : 'git://github.com/stackforge/puppet-swift' - 'neutron': 'git://github.com/stackforge/puppet-neutron' - 'ceilometer' : 'git://github.com/stackforge/puppet-ceilometer' - 'heat' : 'git://github.com/stackforge/puppet-heat' + 'cinder': + repo: 'git://github.com/stackforge/puppet-cinder' + ref: 'origin/stable/havana' + "keystone": + repo: "git://github.com/stackforge/puppet-keystone.git" + ref: 'origin/stable/havana' + "nova": + repo: "git://github.com/stackforge/puppet-nova.git" + ref: 'origin/stable/havana' + "glance": + repo: "git://github.com/stackforge/puppet-glance.git" + ref: 'origin/stable/havana' + 'horizon': + repo: 'git://github.com/stackforge/puppet-horizon' + ref: 'origin/stable/havana' + 'swift' : + repo: 'git://github.com/stackforge/puppet-swift' + ref: 'origin/stable/havana' + 'neutron': + repo: 'git://github.com/stackforge/puppet-neutron' + ref: 'origin/stable/havana' + 'ceilometer' : + repo: 'git://github.com/stackforge/puppet-ceilometer' + ref: 'origin/stable/havana' + 'heat' : + repo: 'git://github.com/stackforge/puppet-heat' + ref: 'origin/stable/havana' "apt": "git://github.com/puppetlabs/puppetlabs-apt.git" "apache": repo: "git://github.com/puppetlabs/puppetlabs-apache.git" diff --git a/.gitreview b/.gitreview index 3ffd590..0a0d132 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.openstack.org port=29418 project=stackforge/puppet-openstack.git +defaultbranch=stable/havana diff --git a/Gemfile b/Gemfile index 89f2e1b..2080973 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,7 @@ source 'https://rubygems.org' group :development, :test do gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', '~> 0.3.2' + gem 'rake', '~> 10.1.1' end if puppetversion = ENV['PUPPET_GEM_VERSION'] diff --git a/Modulefile b/Modulefile index 2580b65..44c44cc 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'puppetlabs-openstack' -version '2.2.0' +version '3.0.0' source 'https://github.com/stackforge/puppet-openstack' author 'Puppet Labs' license 'Apache License 2.0' @@ -7,10 +7,12 @@ summary 'Puppet Labs Openstack Module targeted for Grizzly' description 'Puppet module that pulls together all the individual components of Openstack, resulting is a complete and functional stack.' project_page 'https://github.com/stackforge/puppet-openstack' -dependency 'puppetlabs/glance', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/horizon', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/keystone', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/nova', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/cinder', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/swift', '>= 2.2.0 <3.0.0' -dependency 'puppetlabs/quantum', '>= 2.2.0 <3.0.0' +dependency 'puppetlabs/glance', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/horizon', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/keystone', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/nova', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/cinder', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/swift', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/neutron', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/ceilometer', '>= 3.0.0 <4.0.0' +dependency 'puppetlabs/heat', '>= 3.0.0 <4.0.0' diff --git a/Puppetfile b/Puppetfile index 97e8458..d838a72 100644 --- a/Puppetfile +++ b/Puppetfile @@ -1,15 +1,31 @@ forge "http://forge.puppetlabs.com" -mod 'puppetlabs/nova', :git => 'git://github.com/stackforge/puppet-nova' -mod 'puppetlabs/glance', :git => 'git://github.com/stackforge/puppet-glance' -mod 'puppetlabs/keystone', :git => 'git://github.com/stackforge/puppet-keystone' -mod 'puppetlabs/horizon', :git => 'git://github.com/stackforge/puppet-horizon' -mod 'puppetlabs/swift', :git => 'git://github.com/stackforge/puppet-swift' -mod 'puppetlabs/cinder', :git => 'git://github.com/stackforge/puppet-cinder' -mod 'puppetlabs/tempest', :git => 'git://github.com/stackforge/puppet-tempest' -mod 'stackforge/neutron', :git => 'git://github.com/stackforge/puppet-neutron' +mod 'puppetlabs/nova', + :git => 'git://github.com/stackforge/puppet-nova', + :ref => 'origin/stable/havana' +mod 'puppetlabs/glance', + :git => 'git://github.com/stackforge/puppet-glance', + :ref => 'origin/stable/havana' +mod 'puppetlabs/keystone', + :git => 'git://github.com/stackforge/puppet-keystone', + :ref => 'origin/stable/havana' +mod 'puppetlabs/horizon', + :git => 'git://github.com/stackforge/puppet-horizon', + :ref => 'origin/stable/havana' +mod 'puppetlabs/swift', + :git => 'git://github.com/stackforge/puppet-swift', + :ref => 'origin/stable/havana' +mod 'puppetlabs/cinder', + :git => 'git://github.com/stackforge/puppet-cinder', + :ref => 'origin/stable/havana' +mod 'puppetlabs/tempest', + :git => 'git://github.com/stackforge/puppet-tempest', + :ref => 'origin/stable/havana' +mod 'stackforge/neutron', + :git => 'git://github.com/stackforge/puppet-neutron', + :ref => 'origin/stable/havana' # openstack middleware -mod 'puppet/vswitch', :git => 'git://github.com/bodepd/puppet-vswitch' +mod 'puppet/vswitch', :git => 'git://github.com/stackforge/puppet-vswitch' mod 'puppetlabs/rabbitmq', :git => 'git://github.com/puppetlabs/puppetlabs-rabbitmq', :ref => 'origin/2.x' diff --git a/README.md b/README.md index 19356ad..d3b46cf 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ openstack #### Table of Contents +0. [Deprecation Warning](#deprecation) 1. [Overview - What is the openstack module?](#overview) 2. [Module Description - What does the module do?](#module-description) 3. [Setup - The basics of getting started with cinder](#setup) @@ -13,6 +14,13 @@ openstack 8. [Contributors - Those with commits](#contributors) 9. [Release Notes - Notes on the most recent updates to the module](#release-notes) +Deprecation +----------- + +This implementation of the puppet-openstack module is deprecated, and will be removed for the OpenStack Icehouse release. +A new reference deployment based on the puppetlabs-grizzly module, and being updated for Havana, will replace the +functionality of this module. + Overview -------- @@ -505,6 +513,14 @@ Contributors Release Notes ------------- +**3.0.0** + +* Major release to support OpenStack Havana. +* Switches from puppet-quantum to puppet-neutron for networking. +* Change to ensure nova network compatible provisioning. +* Added support for alternate images with glance. +* Fixed bug to prevent dollar signs and single quote variable to be removed by shell. + **2.2.0** * Added support for syslog. diff --git a/manifests/keystone.pp b/manifests/keystone.pp index e54111b..d953b69 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -128,15 +128,9 @@ $heat_cfn_public_address = false, $heat_cfn_internal_address = false, $heat_cfn_admin_address = false, - $glance = true, - $nova = true, - $cinder = true, - $neutron = true, - $ceilometer = false, - $swift = false, + # logging $use_syslog = false, - $log_facility = 'LOG_USER', - $enabled = true + $log_facility = 'LOG_USER' ) { # Install and configure Keystone diff --git a/manifests/swift/proxy.pp b/manifests/swift/proxy.pp index 4eaea7b..d461493 100644 --- a/manifests/swift/proxy.pp +++ b/manifests/swift/proxy.pp @@ -32,10 +32,12 @@ } else { $real_keystone_host = $keystone_host } - class { 'swift': - swift_hash_suffix => $swift_hash_suffix, - package_ensure => $package_ensure, - } + + ensure_resource('class', 'swift', + { swift_hash_suffix => $swift_hash_suffix, + package_ensure => $package_ensure, + } + ) if $memcached { class { 'memcached': diff --git a/manifests/swift/storage-node.pp b/manifests/swift/storage-node.pp index 1fcdcbb..6e12e33 100644 --- a/manifests/swift/storage-node.pp +++ b/manifests/swift/storage-node.pp @@ -12,10 +12,11 @@ $byte_size = '1024', ) { - class { 'swift': - swift_hash_suffix => $swift_hash_suffix, - package_ensure => $package_ensure, - } + ensure_resource('class', 'swift', + { swift_hash_suffix => $swift_hash_suffix, + package_ensure => $package_ensure, + } + ) case $storage_type { 'loopback': { diff --git a/spec/classes/openstack_keystone_spec.rb b/spec/classes/openstack_keystone_spec.rb index 05b6443..68d9d79 100644 --- a/spec/classes/openstack_keystone_spec.rb +++ b/spec/classes/openstack_keystone_spec.rb @@ -95,7 +95,6 @@ it do should contain_class('swift::keystone::auth').with( :password => 'dude', - :address => '127.0.0.1', :region => 'RegionOne' ) end diff --git a/spec/classes/openstack_repo_spec.rb b/spec/classes/openstack_repo_spec.rb index f51df32..b544525 100644 --- a/spec/classes/openstack_repo_spec.rb +++ b/spec/classes/openstack_repo_spec.rb @@ -103,6 +103,7 @@ :operatingsystemrelease => '12.04', :lsbdistdescription => 'Ubuntu 12.04.1 LTS', :lsbdistcodename => 'precise', + :lsbdistid => 'ubuntu', } end @@ -123,6 +124,7 @@ :operatingsystemrelease => '12.04', :lsbdistdescription => 'Ubuntu 12.04.1 LTS', :lsbdistcodename => 'precise', + :lsbdistid => 'ubuntu', } end diff --git a/spec/classes/openstack_repo_uca_spec.rb b/spec/classes/openstack_repo_uca_spec.rb index 15a7b08..11d161a 100644 --- a/spec/classes/openstack_repo_uca_spec.rb +++ b/spec/classes/openstack_repo_uca_spec.rb @@ -11,6 +11,7 @@ :operatingsystemrelease => '12.04', :lsbdistdescription => 'Ubuntu 12.04.1 LTS', :lsbdistcodename => 'precise', + :lsbdistid => 'ubuntu', } end it do @@ -32,6 +33,7 @@ :operatingsystemrelease => '12.04', :lsbdistdescription => 'Ubuntu 12.04.1 LTS', :lsbdistcodename => 'precise', + :lsbdistid => 'ubuntu', } end diff --git a/templates/test_nova.sh.erb b/templates/test_nova.sh.erb index c9842ac..092efaf 100644 --- a/templates/test_nova.sh.erb +++ b/templates/test_nova.sh.erb @@ -6,10 +6,10 @@ source <%= @rc_file_path %> <% if @image_type == 'cirros' -%> # Grab an image. Cirros is a nice small Linux that's easy to deploy -wget --quiet https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img +wget --quiet http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img # Add it to glance so that we can use it in Openstack -glance add name='cirros image' is_public=true container_format=bare disk_format=qcow2 < cirros-0.3.0-x86_64-disk.img +glance add name='cirros image' is_public=true container_format=bare disk_format=qcow2 < cirros-0.3.1-x86_64-disk.img # Caputre the Image ID so taht we can call the right UUID for this image IMAGE_ID=`glance index | grep 'cirros image' | head -1 | awk -F' ' '{print $1}'`