Skip to content
Browse files

Merge remote-tracking branch 'origin/master' into HEAD

  • Loading branch information...
2 parents eb4df12 + 240a58f commit 4acdc9a9fa66aa253d35e84bb396d4e36a9cdf49 Dan Bode committed Oct 23, 2012
Showing with 36 additions and 9 deletions.
  1. +18 −0 .travis.yml
  2. +10 −1 CHANGELOG
  3. +8 −8 Modulefile
View
18 .travis.yml
@@ -0,0 +1,18 @@
+language: ruby
+rvm:
+ - 1.8.7
+before_script:
+after_script:
+script: "rake spec"
+branches:
+ only:
+ - master
+ - folsom
+ - essex
+env:
+ - PUPPET_VERSION=2.7.13
+ - PUPPET_VERSION=2.7.6
+ - PUPPET_VERSION=2.6.9
+notifications:
+ email: false
+gemfile: .gemfile
View
11 CHANGELOG
@@ -1,2 +1,11 @@
+* 2012-10-08 0.1.0
+- testing improvements
+- compute.pp's admin_password should sync with $nova_user_password of controller.pp
+- Add missing send_arp_for_ha for multi_host mode
+- add enable parameter
+- fix rabbitmq connection
+- enable floating ip for all in one
+- add secret key for horizon
+- add swift manifests
* 2012-06-08 0.1.0
-- initial release
+- initial release
View
16 Modulefile
@@ -1,15 +1,15 @@
name 'puppetlabs-openstack'
-version '0.1.0'
+version '0.2.0'
source 'https://github.com/puppetlabs/puppetlabs-openstack'
author 'Puppet Labs'
license 'Apache License 2.0'
summary 'Puppet Labs Openstack Module'
-description 'Module to install common openstack configurations using puppet'
+description 'Module to install common openstack-essex configurations using puppet'
project_page 'https://github.com/puppetlabs/puppetlabs-openstack'
-dependency 'puppetlabs/glance', '>= 0.1.0'
-dependency 'puppetlabs/horizon', '>= 0.1.0'
-dependency 'puppetlabs/keystone', '>= 0.1.0'
-dependency 'saz/memcached', '>= 2.0.1'
-dependency 'puppetlabs/mysql','>= 0.3.0'
-dependency 'puppetlabs/nova', '>= 0.1.0'
+dependency 'puppetlabs/glance', '>= 0.2.0'
+dependency 'puppetlabs/horizon', '>= 0.2.0'
+dependency 'puppetlabs/keystone', '>= 0.2.0'
+dependency 'saz/memcached', '>= 2.0.2'
+dependency 'puppetlabs/mysql','>= 0.5.0'
+dependency 'puppetlabs/nova', '>= 0.2.0'

0 comments on commit 4acdc9a

Please sign in to comment.
Something went wrong with that request. Please try again.