openstack/puppet-nova
Code Issues Proposed changes

Drop dependency on apt module.

Browse Source 
Nova doesn't appear to have any direct dependencies on apt so we
should drop this.

Change-Id: I9b9580db655b129d41fed4ac35a999c1a1c639c7
This commit is contained in:
Dan Prince 2013-04-23 14:49:23 -04:00
parent 8473dc3fcf
commit 590858a45b
5 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.fixtures.yml
View File

@ -1,6 +1,5 @@
fixtures:
repositories:
"apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
"keystone": "git://github.com/stackforge/puppet-keystone.git"
"cinder": "git://github.com/stackforge/puppet-cinder.git"
"mysql": "git://github.com/puppetlabs/puppetlabs-mysql.git"

1
Modulefile
View File

@ -8,7 +8,6 @@ description 'Puppet module to install and configure the OpenStack Nova compute s
project_page 'https://github.com/puppetlabs/puppetlabs-nova'
## Add dependencies, if any:
dependency 'puppetlabs/apt', '>= 0.0.4'
dependency 'puppetlabs/glance', '>= 1.0.0'
dependency 'puppetlabs/keystone', '>= 1.0.1'
dependency 'puppetlabs/cinder', '>= 1.0.1'

17
examples/all.pp
View File

@ -24,23 +24,6 @@ resources { 'nova_config':
purge => true,
}
#if $::osfamily == 'Debian' {
# # temporarily update this to use the
# # latest tested packages from precise
# # eventually, these packages need to be moved
# # to the openstack module
# stage { 'nova_ppa':
# before => Stage['main']
# }
#
# class { 'apt':
# stage => 'nova_ppa',
# }
# class { 'keystone::repo::trunk':
# stage => 'nova_ppa',
# }
#}
# this is a hack that I have to do b/c openstack nova
# sets up a route to reroute calls to the metadata server
# to its own server which fails

17
examples/multi.pp
View File

@ -13,23 +13,6 @@ resources { 'nova_config':
purge => true,
}
if $::osfamily == 'Debian' {
# temporarily update this to use the
# latest tested packages from precise
# eventually, these packages need to be moved
# to the openstack module
stage { 'nova_ppa':
before => Stage['main']
}
class { 'apt':
stage => 'nova_ppa',
}
class { 'keystone::repo::trunk':
stage => 'nova_ppa',
}
}
Exec {
logoutput => true,
}

20
examples/site.pp
View File

@ -17,21 +17,6 @@ resources { 'nova_config':
purge => true,
}
# temporarily update this to use the
# latest tested packages from precise
# eventually, these packages need to be moved
# to the openstack module
stage { 'nova_ppa':
before => Stage['main']
}
class { 'apt':
stage => 'nova_ppa',
}
class { 'keystone::repo::trunk':
stage => 'nova_ppa',
}
# this is a hack that I have to do b/c openstack nova
# sets up a route to reroute calls to the metadata server
# to its own server which fails
@ -112,11 +97,6 @@ node glance {
}
node rabbitmq {
if($::operatingsystem == 'Ubuntu') {
class { 'rabbitmq::repo::apt':
stage => 'nova_ppa',
}
}
class { 'nova::rabbitmq':
userid => $rabbit_user,
password => $rabbit_password,