Havana refactor

.gitmodules

@@ -1,102 +0,0 @@
-[submodule "apache"]
-	path = apache
-	url = https://github.com/puppetlabs/puppetlabs-apache.git
-[submodule "ceilometer"]
-	path = ceilometer
-	url = https://github.com/stackforge/puppet-ceilometer.git
-[submodule "certmonger"]
-	path = certmonger
-	url = https://github.com/rcritten/puppet-certmonger.git
-[submodule "cinder"]
-	path = cinder
-	url = https://github.com/stackforge/puppet-cinder.git
-[submodule "concat"]
-	path = concat
-	url = https://github.com/puppetlabs/puppetlabs-concat.git
-[submodule "firewall"]
-	path = firewall
-	url = https://github.com/puppetlabs/puppetlabs-firewall.git
-[submodule "glance"]
-	path = glance
-	url = https://github.com/stackforge/puppet-glance.git
-[submodule "haproxy"]
-	path = haproxy
-	url = https://github.com/puppetlabs/puppetlabs-haproxy.git
-[submodule "heat"]
-	path = heat
-	url = https://github.com/stackforge/puppet-heat.git
-[submodule "horizon"]
-	path = horizon
-	url = https://github.com/stackforge/puppet-horizon.git
-[submodule "inifile"]
-	path = inifile
-	url = https://github.com/puppetlabs/puppetlabs-inifile.git
-[submodule "keystone"]
-	path = keystone
-	url = https://github.com/stackforge/puppet-keystone.git
-[submodule "memcached"]
-	path = memcached
-	url = https://github.com/saz/puppet-memcached.git
-[submodule "mongodb"]
-	path = mongodb
-	url = https://github.com/puppetlabs/puppetlabs-mongodb.git
-[submodule "mysql"]
-	path = mysql
-	url = https://github.com/packstack/puppetlabs-mysql.git
-[submodule "neutron"]
-	path = neutron
-	url = https://github.com/stackforge/puppet-neutron.git
-[submodule "nova"]
-	path = nova
-	url = https://github.com/stackforge/puppet-nova.git
-[submodule "nssdb"]
-	path = nssdb
-	url = https://github.com/rcritten/puppet-nssdb.git
-[submodule "openstack"]
-	path = openstack
-	url = https://github.com/stackforge/puppet-openstack.git
-[submodule "pacemaker"]
-	path = pacemaker
-	url = https://github.com/radez/puppet-pacemaker.git
-[submodule "qpid"]
-	path = qpid
-	url = https://github.com/dprince/puppet-qpid
-[submodule "rsync"]
-	path = rsync
-	url = https://github.com/puppetlabs/puppetlabs-rsync.git
-[submodule "ssh"]
-	path = ssh
-	url = https://github.com/saz/puppet-ssh.git
-[submodule "stdlib"]
-	path = stdlib
-	url = https://github.com/puppetlabs/puppetlabs-stdlib.git
-[submodule "swift"]
-	path = swift
-	url = https://github.com/stackforge/puppet-swift.git
-[submodule "sysctl"]
-	path = sysctl
-	url = https://github.com/puppetlabs/puppetlabs-sysctl.git
-[submodule "tempest"]
-	path = tempest
-	url = https://github.com/stackforge/puppet-tempest.git
-[submodule "vcsrepo"]
-	path = vcsrepo
-	url = https://github.com/puppetlabs/puppetlabs-vcsrepo.git
-[submodule "vlan"]
-	path = vlan
-	url = https://github.com/derekhiggins/puppet-vlan.git
-[submodule "vswitch"]
-	path = vswitch
-	url = https://github.com/stackforge/puppet-vswitch.git
-[submodule "xinetd"]
-	path = xinetd
-	url = https://github.com/packstack/puppetlabs-xinetd.git
-[submodule "gluster"]
-	path = gluster
-	url = https://github.com/purpleidea/puppet-gluster.git
-[submodule "common"]
-	path = common
-	url = https://github.com/purpleidea/puppet-common.git
-[submodule "puppet"]
-	path = puppet
-	url = https://github.com/purpleidea/puppet-puppet.git

Puppetfile

@@ -0,0 +1,135 @@
+mod 'apache',
+  :commit => 'a9017af0190bbfaf56cffbac042ca2a081198e89',
+  :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
+
+mod 'ceilometer',
+  :commit => 'a7d368dc4d2e85103fc058149d45140431b53743',
+  :git => 'https://github.com/stackforge/puppet-ceilometer.git'
+
+mod 'certmonger',
+  :commit => '5fbf10fbbff4aed4db30e839c63c99b195e8425a',
+  :git => 'https://github.com/rcritten/puppet-certmonger.git'
+
+mod 'cinder',
+  :commit => 'f3e4aeeb92d300b3c05b07d3c79a812c129a95e7',
+  :git => 'https://github.com/stackforge/puppet-cinder.git'
+
+mod 'common',
+  :commit => '2c0ed2844c606fd806bde0c02e47e79c88fab4a9',
+  :git => 'https://github.com/purpleidea/puppet-common.git'
+
+mod 'concat',
+  :commit => '031bf261289dcbb32e63b053ed5b3a82117698c0',
+  :git => 'https://github.com/puppetlabs/puppetlabs-concat.git'
+
+mod 'firewall',
+  :commit => 'c147a624fb3dba7df625d0d7571b1b6669bcfca5',
+  :git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'
+
+mod 'glance',
+  :commit => '951a66d5351b5bb5effe90cfddc5cad85eb7f383',
+  :git => 'https://github.com/stackforge/puppet-glance.git'
+
+mod 'gluster',
+  :commit => '80c2b13448c97c70a4b4bc0e402e00ecb5d681d5',
+  :git => 'https://github.com/purpleidea/puppet-gluster.git'
+
+mod 'haproxy',
+  :commit => 'f381510e940ee11feb044c1c728ba2e5af807c79',
+  :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
+
+mod 'heat',
+  :commit => 'a64082e4f8ec75ecadaf20a02678647a7af22fb6',
+  :git => 'https://github.com/stackforge/puppet-heat.git'
+
+mod 'horizon',
+  :commit => '3f8cb83207c398b9870d74693b825573bccffa20',
+  :git => 'https://github.com/stackforge/puppet-horizon.git'
+
+mod 'inifile',
+  :commit => 'fe9b0d5229ea37179a08c4b49239da9bc950acd1',
+  :git => 'https://github.com/puppetlabs/puppetlabs-inifile.git',
+
+mod 'keystone',
+  :commit => 'ec5e802d642cc1502f98bc53621dd0f61198a586',
+  :git => 'https://github.com/stackforge/puppet-keystone.git'
+
+mod 'memcached',
+  :commit => '49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7',
+  :git => 'https://github.com/saz/puppet-memcached.git'
+
+mod 'mongodb',
+  :commit => '3f392925710f1758a95f1775d700b5fb787a003d',
+  :git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'
+
+mod 'mysql',
+  :commit => '83abc4556bbf6745708c08375649c9d71b6f66db',
+  :git => 'https://github.com/packstack/puppetlabs-mysql.git'
+
+mod 'neutron',
+  :commit => '16682d963580397fa526be4ba296f9e1a62c08eb',
+  :git => 'https://github.com/stackforge/puppet-neutron.git',
+
+mod 'nova',
+  :commit => '6b6445e0e7c3f717150bfd5a8c0a1314fbbaf289',
+  :git => 'https://github.com/stackforge/puppet-nova.git',
+
+mod 'nssdb',
+  :commit => 'b3799a9a7c62c3b5b7968f9860220a885b45fb8a',
+  :git => 'https://github.com/rcritten/puppet-nssdb.git'
+
+mod 'openstack',
+  :commit => '8a3e0d5696bcd7c68d5bf321ff2c9e62c0a6e534',
+  :git => 'https://github.com/stackforge/puppet-openstack.git'
+
+mod 'pacemaker',
+  :commit => '21950c9b5e619a3cb02f01f66cd4cb33d209a690',
+  :git => 'https://github.com/radez/puppet-pacemaker.git'
+
+mod 'puppet',
+  :commit => '07ec49d1f67a498b31b4f164678a76c464e129c4',
+  :git => 'https://github.com/purpleidea/puppet-puppet.git'
+
+mod 'qpid',
+  :commit => '953028ba9abdf563bd95970ccf890237711072fb',
+  :git => 'https://github.com/dprince/puppet-qpid'
+
+mod 'rsync',
+  :commit => '357d51f3a6a22bc3da842736176c3510e507b4fb',
+  :git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'
+
+mod 'ssh',
+  :commit => 'd6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4',
+  :git => 'https://github.com/saz/puppet-ssh.git'
+
+mod 'stdlib',
+  :commit => '4d2558f383e18bbe322dd0feb073555491216ab4',
+  :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
+
+mod 'swift',
+  :commit => '033a8bedf60f4e4942ece42bb71679f2ffcb3f95',
+  :git => 'https://github.com/stackforge/puppet-swift.git'
+
+mod 'sysctl',
+  :commit => 'c4486acc2d66de857dbccd8b4b945ea803226705',
+  :git => 'https://github.com/puppetlabs/puppetlabs-sysctl.git'
+
+mod 'tempest',
+  :commit => '2cfece45a39cfea162111bea15f597e38ca04e98',
+  :git => 'https://github.com/stackforge/puppet-tempest.git'
+
+mod 'vcsrepo',
+  :commit => '6f7507a2a48ff0a58c7db026760a2eb84e382a77',
+  :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo.git'
+
+mod 'vlan',
+  :commit => 'c937de75c28e63fba8d8738ad6a5f2ede517e53d',
+  :git => 'https://github.com/derekhiggins/puppet-vlan.git'
+
+mod 'vswitch',
+  :commit => 'b642b844db6d7df1ced6f11abd641a0982e06363',
+  :git => 'https://github.com/stackforge/puppet-vswitch.git'
+
+mod 'xinetd',
+  :commit => 'bba48fad94c6538384173e60900a17c6f7ef7ca3',
+  :git => 'https://github.com/packstack/puppetlabs-xinetd.git'

apache/.fixtures.yml

@@ -0,0 +1,6 @@
+fixtures:
+  repositories:
+    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
+  symlinks:
+    apache: "#{source_dir}"

apache/.gitignore

@@ -0,0 +1,7 @@
+.pkg
+Gemfile.lock
+vendor
+spec/fixtures
+.rspec_system
+.bundle
+.*sw*

apache/.nodeset.yml

@@ -0,0 +1,31 @@
+---
+default_set: 'centos-64-x64'
+sets:
+  'centos-59-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'centos-59-x64'
+  'centos-64-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'centos-64-x64'
+  'fedora-18-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'fedora-18-x64'
+  'debian-607-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'debian-607-x64'
+  'debian-70rc1-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'debian-70rc1-x64'
+  'ubuntu-server-10044-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'ubuntu-server-10044-x64'
+  'ubuntu-server-12042-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'ubuntu-server-12042-x64'

apache/.travis.yml

@@ -0,0 +1,40 @@
+---
+branches:
+  only:
+  - master
+language: ruby
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+after_success:
+  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
+  - .forge-releng/publish
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+env:
+  matrix:
+    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+    - PUPPET_GEM_VERSION="~> 3.0"
+  global:
+    - PUBLISHER_LOGIN=puppetlabs
+    - secure: |-
+        MO4pB4bqBQJjm2yFHf3Mgho+y0Qv4GmMxTMhzI02tGy1V0HMtruZbR7EBN0i
+        n2CiR7V9V0mNR7/ymzDMF9yVBcgqyXMsp/C6u992Dd0U63ZwFpbRWkxuAeEY
+        ioupWBkiczjVEo+sxn+gVOnx28pcH/X8kDWbr6wFOMIjO03K66Y=
+matrix:
+  fast_finish: true
+  exclude:
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 3.2.0"
+notifications:
+  email: false