Merge pull request #18 from bodepd/feautre/master/reorganize

Converted into nova module repo.
2011-06-16 20:32:37 -07:00 · 2011-06-16 20:32:37 -07:00 · 5e59e325f8
parent 958a237803 072e519171
commit 5e59e325f8
65 changed files with 4 additions and 81 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,21 +0,0 @@
-[submodule "apt"]
-	path = apt
-	url = git://github.com/puppetlabs/puppet-apt.git
-[submodule "mysql"]
-	path = mysql
-	url = git://github.com/puppetlabs/puppetlabs-mysql.git
-[submodule "gcc"]
-	path = gcc
-	url = git://github.com/puppetlabs/puppetlabs-gcc.git
-[submodule "git"]
-	path = git
-	url = git://github.com/puppetlabs/puppetlabs-git.git
-[submodule "rabbitmq"]
-	path = rabbitmq
-	url = git://github.com/puppetlabs/puppetlabs-rabbitmq.git
-[submodule "stdlib"]
-	path = stdlib
-	url = git://github.com/puppetlabs/puppetlabs-stdlib.git
-[submodule "glance"]
-	path = glance
-	url = git://github.com/puppetlabs/puppetlabs-glance.git
--- a/nova/LICENSE
+++ b/nova/LICENSE
--- a/5
+++ b/5
@ -1 +1,4 @@
-This is actively under development, please do not use!!!!!
+h1. Prerequisites
+
+The openstack repo should be made available:
+see: http://docs.openstack.org/cactus/openstack-compute/admin/content/installing-the-cloud-controller.html
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit a11af502cd839efbdab56da95aa1965e75d7ae1c
--- a/bzr/manifests/init.pp
+++ b/bzr/manifests/init.pp
@ -1,3 +0,0 @@
-class bzr {
-  package { 'bzr': ensure => present }
-}
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 690249cd576c76cc1f104b5d790033b546679d68
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 3ab03f32facab72cebc7c5acd00d3b5715e46985
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 70c652874dc5e7c390759e96aee4c91e37105d40
--- a/nova/lib/puppet/provider/nova_admin/default.rb
+++ b/nova/lib/puppet/provider/nova_admin/default.rb
--- a/nova/lib/puppet/provider/nova_admin/nova_manage.rb
+++ b/nova/lib/puppet/provider/nova_admin/nova_manage.rb
--- a/nova/lib/puppet/provider/nova_config/parsed.rb
+++ b/nova/lib/puppet/provider/nova_config/parsed.rb
--- a/nova/lib/puppet/provider/nova_network/default.rb
+++ b/nova/lib/puppet/provider/nova_network/default.rb
--- a/nova/lib/puppet/provider/nova_network/nova_manage.rb
+++ b/nova/lib/puppet/provider/nova_network/nova_manage.rb
--- a/nova/lib/puppet/provider/nova_project/default.rb
+++ b/nova/lib/puppet/provider/nova_project/default.rb
--- a/nova/lib/puppet/provider/nova_project/nova_manage.rb
+++ b/nova/lib/puppet/provider/nova_project/nova_manage.rb
--- a/nova/lib/puppet/type/nova_admin.rb
+++ b/nova/lib/puppet/type/nova_admin.rb
--- a/nova/lib/puppet/type/nova_config.rb
+++ b/nova/lib/puppet/type/nova_config.rb
--- a/nova/lib/puppet/type/nova_network.rb
+++ b/nova/lib/puppet/type/nova_network.rb
--- a/nova/lib/puppet/type/nova_project.rb
+++ b/nova/lib/puppet/type/nova_project.rb
--- a/nova/manifests/all.pp
+++ b/nova/manifests/all.pp
--- a/nova/manifests/api.pp
+++ b/nova/manifests/api.pp
--- a/nova/manifests/canonical/all.pp
+++ b/nova/manifests/canonical/all.pp
--- a/nova/manifests/compute.pp
+++ b/nova/manifests/compute.pp
--- a/nova/manifests/compute/xenserver.pp
+++ b/nova/manifests/compute/xenserver.pp
--- a/nova/manifests/controller.pp
+++ b/nova/manifests/controller.pp
--- a/nova/manifests/db.pp
+++ b/nova/manifests/db.pp
--- a/nova/manifests/init.pp
+++ b/nova/manifests/init.pp
--- a/nova/manifests/manage/admin.pp
+++ b/nova/manifests/manage/admin.pp
--- a/nova/manifests/manage/network.pp
+++ b/nova/manifests/manage/network.pp
--- a/nova/manifests/manage/project.pp
+++ b/nova/manifests/manage/project.pp
--- a/nova/manifests/messagebus.pp
+++ b/nova/manifests/messagebus.pp
--- a/nova/manifests/network.pp
+++ b/nova/manifests/network.pp
--- a/nova/manifests/network/bridge.pp
+++ b/nova/manifests/network/bridge.pp
--- a/nova/manifests/network/flat.pp
+++ b/nova/manifests/network/flat.pp
--- a/nova/manifests/network/flatdhcp.pp
+++ b/nova/manifests/network/flatdhcp.pp
--- a/nova/manifests/objectstore.pp
+++ b/nova/manifests/objectstore.pp
--- a/nova/manifests/project.pp
+++ b/nova/manifests/project.pp
--- a/nova/manifests/quota.pp
+++ b/nova/manifests/quota.pp
--- a/nova/manifests/rabbitmq.pp
+++ b/nova/manifests/rabbitmq.pp
--- a/nova/manifests/rackspace/all.pp
+++ b/nova/manifests/rackspace/all.pp
--- a/nova/manifests/rackspace/dev.pp
+++ b/nova/manifests/rackspace/dev.pp
--- a/nova/manifests/rackspace/repo.pp
+++ b/nova/manifests/rackspace/repo.pp
--- a/nova/manifests/scheduler.pp
+++ b/nova/manifests/scheduler.pp
--- a/nova/manifests/utilities.pp
+++ b/nova/manifests/utilities.pp
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit fb00c75cedc2c35fbd3ebd0031934c3e1192c377
--- a/nova/README
+++ b/nova/README
@ -1,4 +0,0 @@
-h1. Prerequisites
-
-The openstack repo should be made available:
-see: http://docs.openstack.org/cactus/openstack-compute/admin/content/installing-the-cloud-controller.html
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@ -1,6 +0,0 @@
-class puppet {
-  user { 'puppet': 
-    ensure => present,
-    shell => '/usr/sbin/nologin',
-  }
-}
--- a/python/manifests/init.pp
+++ b/python/manifests/init.pp
@ -1,39 +0,0 @@
-# this is all of the python deps for openstack
-# I should probably split these up to be more 
-# compartamelalzed
-class python {
-  package { 
-    [
-    'python-gflags',
-    'python-carrot',
-    'python-eventlet',
-    'python-ipy',
-    'python-sqlalchemy',
-    'python-mysqldb',
-    'python-webob',
-    'python-mox',
-    'python-routes',
-    'python-daemon',
-    'python-boto',
-    'python-m2crypto',
-    'python-cheetah',
-    'python-netaddr',
-    'python-pastedeploy',
-    'python-migrate',
-    'python-tempita', 
-    'python-twisted',
-    'python-setuptools',
-    'python-nose',
-    'python-dev',
-    'python-pip',
-    'python-sphinx',
-    'python-argparse'
-    ]:
-    ensure => present,
-  }
-  package { ['pep8', 'xenapi']:
-    provider => 'pip',
-    ensure => present,
-    require => Package['python-pip'],
-  }
-}
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit b804bd1ca334b34437abb7ad38535e3bae2ccf1d
--- a/nova/spec/find_spec_utils.rb
+++ b/nova/spec/find_spec_utils.rb
--- a/nova/spec/unit/provider/nova_config/parsed_spec.rb
+++ b/nova/spec/unit/provider/nova_config/parsed_spec.rb
--- a/nova/spec/unit/type/nova_config_spec.rb
+++ b/nova/spec/unit/type/nova_config_spec.rb
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit df2398b59c295c3e27cea5e41a76167a797139d4
--- a/nova/templates/nova.conf.erb
+++ b/nova/templates/nova.conf.erb
--- a/nova/tests/all.pp
+++ b/nova/tests/all.pp
--- a/nova/tests/api.pp
+++ b/nova/tests/api.pp
--- a/nova/tests/canonical/all.pp
+++ b/nova/tests/canonical/all.pp
--- a/nova/tests/compute.pp
+++ b/nova/tests/compute.pp
--- a/nova/tests/db.pp
+++ b/nova/tests/db.pp
--- a/nova/tests/network.pp
+++ b/nova/tests/network.pp
--- a/nova/tests/nova_config.pp
+++ b/nova/tests/nova_config.pp
--- a/nova/tests/objectstore.pp
+++ b/nova/tests/objectstore.pp
--- a/nova/tests/rabbitmq.pp
+++ b/nova/tests/rabbitmq.pp
--- a/nova/tests/rackspace/all.pp
+++ b/nova/tests/rackspace/all.pp
--- a/nova/tests/scheduler.pp
+++ b/nova/tests/scheduler.pp
				`@ -1 +0,0 @@`
				`Subproject commit a11af502cd839efbdab56da95aa1965e75d7ae1c`
				`@ -1 +0,0 @@`
				`Subproject commit 690249cd576c76cc1f104b5d790033b546679d68`
				`@ -1 +0,0 @@`
				`Subproject commit 3ab03f32facab72cebc7c5acd00d3b5715e46985`
				`@ -1 +0,0 @@`
				`Subproject commit 70c652874dc5e7c390759e96aee4c91e37105d40`
				`@ -1 +0,0 @@`
				`Subproject commit fb00c75cedc2c35fbd3ebd0031934c3e1192c377`
				`@ -1 +0,0 @@`
				`Subproject commit b804bd1ca334b34437abb7ad38535e3bae2ccf1d`
				`@ -1 +0,0 @@`
				`Subproject commit df2398b59c295c3e27cea5e41a76167a797139d4`