From 072e5191717dd03924f8cd88ec29c870dd4ce5c1 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Thu, 16 Jun 2011 20:29:58 -0700 Subject: [PATCH] Converted into nova module repo. - removed all submodules I will create an openstack repo to hold all modules (including nova) as submodules - moved nova module to top dir --- .gitmodules | 21 ---------- nova/LICENSE => LICENSE | 0 README | 5 ++- apt | 1 - bzr/manifests/init.pp | 3 -- gcc | 1 - git | 1 - glance | 1 - .../puppet/provider/nova_admin/default.rb | 0 .../puppet/provider/nova_admin/nova_manage.rb | 0 .../puppet/provider/nova_config/parsed.rb | 0 .../puppet/provider/nova_network/default.rb | 0 .../provider/nova_network/nova_manage.rb | 0 .../puppet/provider/nova_project/default.rb | 0 .../provider/nova_project/nova_manage.rb | 0 {nova/lib => lib}/puppet/type/nova_admin.rb | 0 {nova/lib => lib}/puppet/type/nova_config.rb | 0 {nova/lib => lib}/puppet/type/nova_network.rb | 0 {nova/lib => lib}/puppet/type/nova_project.rb | 0 {nova/manifests => manifests}/all.pp | 0 {nova/manifests => manifests}/api.pp | 0 .../manifests => manifests}/canonical/all.pp | 0 {nova/manifests => manifests}/compute.pp | 0 .../compute/xenserver.pp | 0 {nova/manifests => manifests}/controller.pp | 0 {nova/manifests => manifests}/db.pp | 0 {nova/manifests => manifests}/init.pp | 0 {nova/manifests => manifests}/manage/admin.pp | 0 .../manifests => manifests}/manage/network.pp | 0 .../manifests => manifests}/manage/project.pp | 0 {nova/manifests => manifests}/messagebus.pp | 0 {nova/manifests => manifests}/network.pp | 0 .../manifests => manifests}/network/bridge.pp | 0 {nova/manifests => manifests}/network/flat.pp | 0 .../network/flatdhcp.pp | 0 {nova/manifests => manifests}/objectstore.pp | 0 {nova/manifests => manifests}/project.pp | 0 {nova/manifests => manifests}/quota.pp | 0 {nova/manifests => manifests}/rabbitmq.pp | 0 .../manifests => manifests}/rackspace/all.pp | 0 .../manifests => manifests}/rackspace/dev.pp | 0 .../manifests => manifests}/rackspace/repo.pp | 0 {nova/manifests => manifests}/scheduler.pp | 0 {nova/manifests => manifests}/utilities.pp | 0 mysql | 1 - nova/README | 4 -- puppet/manifests/init.pp | 6 --- python/manifests/init.pp | 39 ------------------- rabbitmq | 1 - {nova/spec => spec}/find_spec_utils.rb | 0 .../unit/provider/nova_config/parsed_spec.rb | 0 .../unit/type/nova_config_spec.rb | 0 stdlib | 1 - {nova/templates => templates}/nova.conf.erb | 0 {nova/tests => tests}/all.pp | 0 {nova/tests => tests}/api.pp | 0 {nova/tests => tests}/canonical/all.pp | 0 {nova/tests => tests}/compute.pp | 0 {nova/tests => tests}/db.pp | 0 {nova/tests => tests}/network.pp | 0 {nova/tests => tests}/nova_config.pp | 0 {nova/tests => tests}/objectstore.pp | 0 {nova/tests => tests}/rabbitmq.pp | 0 {nova/tests => tests}/rackspace/all.pp | 0 {nova/tests => tests}/scheduler.pp | 0 65 files changed, 4 insertions(+), 81 deletions(-) delete mode 100644 .gitmodules rename nova/LICENSE => LICENSE (100%) delete mode 160000 apt delete mode 100644 bzr/manifests/init.pp delete mode 160000 gcc delete mode 160000 git delete mode 160000 glance rename {nova/lib => lib}/puppet/provider/nova_admin/default.rb (100%) rename {nova/lib => lib}/puppet/provider/nova_admin/nova_manage.rb (100%) rename {nova/lib => lib}/puppet/provider/nova_config/parsed.rb (100%) rename {nova/lib => lib}/puppet/provider/nova_network/default.rb (100%) rename {nova/lib => lib}/puppet/provider/nova_network/nova_manage.rb (100%) rename {nova/lib => lib}/puppet/provider/nova_project/default.rb (100%) rename {nova/lib => lib}/puppet/provider/nova_project/nova_manage.rb (100%) rename {nova/lib => lib}/puppet/type/nova_admin.rb (100%) rename {nova/lib => lib}/puppet/type/nova_config.rb (100%) rename {nova/lib => lib}/puppet/type/nova_network.rb (100%) rename {nova/lib => lib}/puppet/type/nova_project.rb (100%) rename {nova/manifests => manifests}/all.pp (100%) rename {nova/manifests => manifests}/api.pp (100%) rename {nova/manifests => manifests}/canonical/all.pp (100%) rename {nova/manifests => manifests}/compute.pp (100%) rename {nova/manifests => manifests}/compute/xenserver.pp (100%) rename {nova/manifests => manifests}/controller.pp (100%) rename {nova/manifests => manifests}/db.pp (100%) rename {nova/manifests => manifests}/init.pp (100%) rename {nova/manifests => manifests}/manage/admin.pp (100%) rename {nova/manifests => manifests}/manage/network.pp (100%) rename {nova/manifests => manifests}/manage/project.pp (100%) rename {nova/manifests => manifests}/messagebus.pp (100%) rename {nova/manifests => manifests}/network.pp (100%) rename {nova/manifests => manifests}/network/bridge.pp (100%) rename {nova/manifests => manifests}/network/flat.pp (100%) rename {nova/manifests => manifests}/network/flatdhcp.pp (100%) rename {nova/manifests => manifests}/objectstore.pp (100%) rename {nova/manifests => manifests}/project.pp (100%) rename {nova/manifests => manifests}/quota.pp (100%) rename {nova/manifests => manifests}/rabbitmq.pp (100%) rename {nova/manifests => manifests}/rackspace/all.pp (100%) rename {nova/manifests => manifests}/rackspace/dev.pp (100%) rename {nova/manifests => manifests}/rackspace/repo.pp (100%) rename {nova/manifests => manifests}/scheduler.pp (100%) rename {nova/manifests => manifests}/utilities.pp (100%) delete mode 160000 mysql delete mode 100644 nova/README delete mode 100644 puppet/manifests/init.pp delete mode 100644 python/manifests/init.pp delete mode 160000 rabbitmq rename {nova/spec => spec}/find_spec_utils.rb (100%) rename {nova/spec => spec}/unit/provider/nova_config/parsed_spec.rb (100%) rename {nova/spec => spec}/unit/type/nova_config_spec.rb (100%) delete mode 160000 stdlib rename {nova/templates => templates}/nova.conf.erb (100%) rename {nova/tests => tests}/all.pp (100%) rename {nova/tests => tests}/api.pp (100%) rename {nova/tests => tests}/canonical/all.pp (100%) rename {nova/tests => tests}/compute.pp (100%) rename {nova/tests => tests}/db.pp (100%) rename {nova/tests => tests}/network.pp (100%) rename {nova/tests => tests}/nova_config.pp (100%) rename {nova/tests => tests}/objectstore.pp (100%) rename {nova/tests => tests}/rabbitmq.pp (100%) rename {nova/tests => tests}/rackspace/all.pp (100%) rename {nova/tests => tests}/scheduler.pp (100%) diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 9dff7954..00000000 --- a/.gitmodules +++ /dev/null @@ -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 diff --git a/nova/LICENSE b/LICENSE similarity index 100% rename from nova/LICENSE rename to LICENSE diff --git a/README b/README index 85f78ca5..1bd4e1ad 100644 --- a/README +++ b/README @@ -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 diff --git a/apt b/apt deleted file mode 160000 index a11af502..00000000 --- a/apt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a11af502cd839efbdab56da95aa1965e75d7ae1c diff --git a/bzr/manifests/init.pp b/bzr/manifests/init.pp deleted file mode 100644 index 7a04dcc1..00000000 --- a/bzr/manifests/init.pp +++ /dev/null @@ -1,3 +0,0 @@ -class bzr { - package { 'bzr': ensure => present } -} diff --git a/gcc b/gcc deleted file mode 160000 index 690249cd..00000000 --- a/gcc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 690249cd576c76cc1f104b5d790033b546679d68 diff --git a/git b/git deleted file mode 160000 index 3ab03f32..00000000 --- a/git +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3ab03f32facab72cebc7c5acd00d3b5715e46985 diff --git a/glance b/glance deleted file mode 160000 index 70c65287..00000000 --- a/glance +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 70c652874dc5e7c390759e96aee4c91e37105d40 diff --git a/nova/lib/puppet/provider/nova_admin/default.rb b/lib/puppet/provider/nova_admin/default.rb similarity index 100% rename from nova/lib/puppet/provider/nova_admin/default.rb rename to lib/puppet/provider/nova_admin/default.rb diff --git a/nova/lib/puppet/provider/nova_admin/nova_manage.rb b/lib/puppet/provider/nova_admin/nova_manage.rb similarity index 100% rename from nova/lib/puppet/provider/nova_admin/nova_manage.rb rename to lib/puppet/provider/nova_admin/nova_manage.rb diff --git a/nova/lib/puppet/provider/nova_config/parsed.rb b/lib/puppet/provider/nova_config/parsed.rb similarity index 100% rename from nova/lib/puppet/provider/nova_config/parsed.rb rename to lib/puppet/provider/nova_config/parsed.rb diff --git a/nova/lib/puppet/provider/nova_network/default.rb b/lib/puppet/provider/nova_network/default.rb similarity index 100% rename from nova/lib/puppet/provider/nova_network/default.rb rename to lib/puppet/provider/nova_network/default.rb diff --git a/nova/lib/puppet/provider/nova_network/nova_manage.rb b/lib/puppet/provider/nova_network/nova_manage.rb similarity index 100% rename from nova/lib/puppet/provider/nova_network/nova_manage.rb rename to lib/puppet/provider/nova_network/nova_manage.rb diff --git a/nova/lib/puppet/provider/nova_project/default.rb b/lib/puppet/provider/nova_project/default.rb similarity index 100% rename from nova/lib/puppet/provider/nova_project/default.rb rename to lib/puppet/provider/nova_project/default.rb diff --git a/nova/lib/puppet/provider/nova_project/nova_manage.rb b/lib/puppet/provider/nova_project/nova_manage.rb similarity index 100% rename from nova/lib/puppet/provider/nova_project/nova_manage.rb rename to lib/puppet/provider/nova_project/nova_manage.rb diff --git a/nova/lib/puppet/type/nova_admin.rb b/lib/puppet/type/nova_admin.rb similarity index 100% rename from nova/lib/puppet/type/nova_admin.rb rename to lib/puppet/type/nova_admin.rb diff --git a/nova/lib/puppet/type/nova_config.rb b/lib/puppet/type/nova_config.rb similarity index 100% rename from nova/lib/puppet/type/nova_config.rb rename to lib/puppet/type/nova_config.rb diff --git a/nova/lib/puppet/type/nova_network.rb b/lib/puppet/type/nova_network.rb similarity index 100% rename from nova/lib/puppet/type/nova_network.rb rename to lib/puppet/type/nova_network.rb diff --git a/nova/lib/puppet/type/nova_project.rb b/lib/puppet/type/nova_project.rb similarity index 100% rename from nova/lib/puppet/type/nova_project.rb rename to lib/puppet/type/nova_project.rb diff --git a/nova/manifests/all.pp b/manifests/all.pp similarity index 100% rename from nova/manifests/all.pp rename to manifests/all.pp diff --git a/nova/manifests/api.pp b/manifests/api.pp similarity index 100% rename from nova/manifests/api.pp rename to manifests/api.pp diff --git a/nova/manifests/canonical/all.pp b/manifests/canonical/all.pp similarity index 100% rename from nova/manifests/canonical/all.pp rename to manifests/canonical/all.pp diff --git a/nova/manifests/compute.pp b/manifests/compute.pp similarity index 100% rename from nova/manifests/compute.pp rename to manifests/compute.pp diff --git a/nova/manifests/compute/xenserver.pp b/manifests/compute/xenserver.pp similarity index 100% rename from nova/manifests/compute/xenserver.pp rename to manifests/compute/xenserver.pp diff --git a/nova/manifests/controller.pp b/manifests/controller.pp similarity index 100% rename from nova/manifests/controller.pp rename to manifests/controller.pp diff --git a/nova/manifests/db.pp b/manifests/db.pp similarity index 100% rename from nova/manifests/db.pp rename to manifests/db.pp diff --git a/nova/manifests/init.pp b/manifests/init.pp similarity index 100% rename from nova/manifests/init.pp rename to manifests/init.pp diff --git a/nova/manifests/manage/admin.pp b/manifests/manage/admin.pp similarity index 100% rename from nova/manifests/manage/admin.pp rename to manifests/manage/admin.pp diff --git a/nova/manifests/manage/network.pp b/manifests/manage/network.pp similarity index 100% rename from nova/manifests/manage/network.pp rename to manifests/manage/network.pp diff --git a/nova/manifests/manage/project.pp b/manifests/manage/project.pp similarity index 100% rename from nova/manifests/manage/project.pp rename to manifests/manage/project.pp diff --git a/nova/manifests/messagebus.pp b/manifests/messagebus.pp similarity index 100% rename from nova/manifests/messagebus.pp rename to manifests/messagebus.pp diff --git a/nova/manifests/network.pp b/manifests/network.pp similarity index 100% rename from nova/manifests/network.pp rename to manifests/network.pp diff --git a/nova/manifests/network/bridge.pp b/manifests/network/bridge.pp similarity index 100% rename from nova/manifests/network/bridge.pp rename to manifests/network/bridge.pp diff --git a/nova/manifests/network/flat.pp b/manifests/network/flat.pp similarity index 100% rename from nova/manifests/network/flat.pp rename to manifests/network/flat.pp diff --git a/nova/manifests/network/flatdhcp.pp b/manifests/network/flatdhcp.pp similarity index 100% rename from nova/manifests/network/flatdhcp.pp rename to manifests/network/flatdhcp.pp diff --git a/nova/manifests/objectstore.pp b/manifests/objectstore.pp similarity index 100% rename from nova/manifests/objectstore.pp rename to manifests/objectstore.pp diff --git a/nova/manifests/project.pp b/manifests/project.pp similarity index 100% rename from nova/manifests/project.pp rename to manifests/project.pp diff --git a/nova/manifests/quota.pp b/manifests/quota.pp similarity index 100% rename from nova/manifests/quota.pp rename to manifests/quota.pp diff --git a/nova/manifests/rabbitmq.pp b/manifests/rabbitmq.pp similarity index 100% rename from nova/manifests/rabbitmq.pp rename to manifests/rabbitmq.pp diff --git a/nova/manifests/rackspace/all.pp b/manifests/rackspace/all.pp similarity index 100% rename from nova/manifests/rackspace/all.pp rename to manifests/rackspace/all.pp diff --git a/nova/manifests/rackspace/dev.pp b/manifests/rackspace/dev.pp similarity index 100% rename from nova/manifests/rackspace/dev.pp rename to manifests/rackspace/dev.pp diff --git a/nova/manifests/rackspace/repo.pp b/manifests/rackspace/repo.pp similarity index 100% rename from nova/manifests/rackspace/repo.pp rename to manifests/rackspace/repo.pp diff --git a/nova/manifests/scheduler.pp b/manifests/scheduler.pp similarity index 100% rename from nova/manifests/scheduler.pp rename to manifests/scheduler.pp diff --git a/nova/manifests/utilities.pp b/manifests/utilities.pp similarity index 100% rename from nova/manifests/utilities.pp rename to manifests/utilities.pp diff --git a/mysql b/mysql deleted file mode 160000 index fb00c75c..00000000 --- a/mysql +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fb00c75cedc2c35fbd3ebd0031934c3e1192c377 diff --git a/nova/README b/nova/README deleted file mode 100644 index 1bd4e1ad..00000000 --- a/nova/README +++ /dev/null @@ -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 diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp deleted file mode 100644 index 79ae653e..00000000 --- a/puppet/manifests/init.pp +++ /dev/null @@ -1,6 +0,0 @@ -class puppet { - user { 'puppet': - ensure => present, - shell => '/usr/sbin/nologin', - } -} diff --git a/python/manifests/init.pp b/python/manifests/init.pp deleted file mode 100644 index deac5b7c..00000000 --- a/python/manifests/init.pp +++ /dev/null @@ -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'], - } -} diff --git a/rabbitmq b/rabbitmq deleted file mode 160000 index b804bd1c..00000000 --- a/rabbitmq +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b804bd1ca334b34437abb7ad38535e3bae2ccf1d diff --git a/nova/spec/find_spec_utils.rb b/spec/find_spec_utils.rb similarity index 100% rename from nova/spec/find_spec_utils.rb rename to spec/find_spec_utils.rb diff --git a/nova/spec/unit/provider/nova_config/parsed_spec.rb b/spec/unit/provider/nova_config/parsed_spec.rb similarity index 100% rename from nova/spec/unit/provider/nova_config/parsed_spec.rb rename to spec/unit/provider/nova_config/parsed_spec.rb diff --git a/nova/spec/unit/type/nova_config_spec.rb b/spec/unit/type/nova_config_spec.rb similarity index 100% rename from nova/spec/unit/type/nova_config_spec.rb rename to spec/unit/type/nova_config_spec.rb diff --git a/stdlib b/stdlib deleted file mode 160000 index df2398b5..00000000 --- a/stdlib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit df2398b59c295c3e27cea5e41a76167a797139d4 diff --git a/nova/templates/nova.conf.erb b/templates/nova.conf.erb similarity index 100% rename from nova/templates/nova.conf.erb rename to templates/nova.conf.erb diff --git a/nova/tests/all.pp b/tests/all.pp similarity index 100% rename from nova/tests/all.pp rename to tests/all.pp diff --git a/nova/tests/api.pp b/tests/api.pp similarity index 100% rename from nova/tests/api.pp rename to tests/api.pp diff --git a/nova/tests/canonical/all.pp b/tests/canonical/all.pp similarity index 100% rename from nova/tests/canonical/all.pp rename to tests/canonical/all.pp diff --git a/nova/tests/compute.pp b/tests/compute.pp similarity index 100% rename from nova/tests/compute.pp rename to tests/compute.pp diff --git a/nova/tests/db.pp b/tests/db.pp similarity index 100% rename from nova/tests/db.pp rename to tests/db.pp diff --git a/nova/tests/network.pp b/tests/network.pp similarity index 100% rename from nova/tests/network.pp rename to tests/network.pp diff --git a/nova/tests/nova_config.pp b/tests/nova_config.pp similarity index 100% rename from nova/tests/nova_config.pp rename to tests/nova_config.pp diff --git a/nova/tests/objectstore.pp b/tests/objectstore.pp similarity index 100% rename from nova/tests/objectstore.pp rename to tests/objectstore.pp diff --git a/nova/tests/rabbitmq.pp b/tests/rabbitmq.pp similarity index 100% rename from nova/tests/rabbitmq.pp rename to tests/rabbitmq.pp diff --git a/nova/tests/rackspace/all.pp b/tests/rackspace/all.pp similarity index 100% rename from nova/tests/rackspace/all.pp rename to tests/rackspace/all.pp diff --git a/nova/tests/scheduler.pp b/tests/scheduler.pp similarity index 100% rename from nova/tests/scheduler.pp rename to tests/scheduler.pp