Skip to content
Browse files

Merge branch 'remove_deprecated_auth'

  • Loading branch information...
2 parents a84a1ed + 011fb91 commit 6093a63f062d67dcfcbb753d1acb96438ac8748d @dprince committed May 14, 2012
View
6 manifests/fedora.pp
@@ -18,9 +18,6 @@
$api_server = 'localhost'
-$nova_admin_user = 'admin'
-$nova_project_name = 'nova'
-
$nova_network = '192.168.0.0/24'
$floating_network = '172.20.0.0/24'
@@ -71,9 +68,6 @@
libvirt_type => 'qemu',
- admin_user => $nova_admin_user,
- project_name => $nova_project_name,
-
nova_network => $nova_network,
floating_network => $floating_network,
View
6 manifests/fedora_keystone.pp
@@ -18,9 +18,6 @@
$api_server = 'localhost'
-$nova_admin_user = 'admin'
-$nova_project_name = 'nova'
-
$nova_network = '192.168.0.0/24'
$floating_network = '172.20.0.0/24'
@@ -74,9 +71,6 @@
libvirt_type => 'qemu',
- admin_user => $nova_admin_user,
- project_name => $nova_project_name,
-
nova_network => $nova_network,
floating_network => $floating_network,
keystone_enabled => true,
View
6 manifests/fedora_keystone_qpid.pp
@@ -12,9 +12,6 @@
$api_server = 'localhost'
-$nova_admin_user = 'admin'
-$nova_project_name = 'nova'
-
$nova_network = '192.168.0.0/24'
$floating_network = '172.20.0.0/24'
@@ -98,9 +95,6 @@
libvirt_type => 'qemu',
- admin_user => $nova_admin_user,
- project_name => $nova_project_name,
-
nova_network => $nova_network,
floating_network => $floating_network,
keystone_enabled => true,
View
6 manifests/fedora_keystone_qpid_postgresql.pp
@@ -13,9 +13,6 @@
$api_server = 'localhost'
-$nova_admin_user = 'admin'
-$nova_project_name = 'nova'
-
$nova_network = '192.168.0.0/24'
$floating_network = '172.20.0.0/24'
@@ -92,9 +89,6 @@
libvirt_type => 'qemu',
- admin_user => $nova_admin_user,
- project_name => $nova_project_name,
-
nova_network => $nova_network,
floating_network => $floating_network,
keystone_enabled => true,
View
6 manifests/fedora_keystone_swift.pp
@@ -18,9 +18,6 @@
$api_server = 'localhost'
-$nova_admin_user = 'admin'
-$nova_project_name = 'nova'
-
$nova_network = '192.168.0.0/24'
$floating_network = '172.20.0.0/24'
@@ -74,9 +71,6 @@
libvirt_type => 'qemu',
- admin_user => $nova_admin_user,
- project_name => $nova_project_name,
-
nova_network => $nova_network,
floating_network => $floating_network,
keystone_enabled => true,
View
16 modules/nova/lib/puppet/provider/nova_admin/default.rb
@@ -1,16 +0,0 @@
-Puppet::Type.type(:nova_admin).provide(:default) do
-
- desc "This is a default provider that does nothing. This allows us to install nova-manage on the same puppet run where we want to use it."
-
- def create
- return false
- end
-
- def destroy
- return false
- end
-
- def exists?
- fail('This is just the default provider for nova_admin, all it does is fail')
- end
-end
View
22 modules/nova/lib/puppet/provider/nova_admin/nova_manage.rb
@@ -1,22 +0,0 @@
-Puppet::Type.type(:nova_admin).provide(:nova_manage) do
-
- desc "Manage nova admin user"
-
- defaultfor :kernel => 'Linux'
-
- commands :nova_manage => 'nova-manage'
-
- def exists?
- nova_manage("user", "list").match(/^#{resource[:name]}$/)
- end
-
- def create
- nova_manage("user", "admin", resource[:name])
- end
-
- def destroy
- nova_manage("user", "delete", resource[:name])
- end
-
-end
-
View
17 modules/nova/lib/puppet/provider/nova_project/default.rb
@@ -1,17 +0,0 @@
-Puppet::Type.type(:nova_project).provide(:default) do
-
- desc "This is a default provider that does nothing. This allows us to install nova-manage on the same puppet run where we want to use it."
-
- def create
- return false
- end
-
- def destroy
- return false
- end
-
- def exists?
- fail('This is just the default provider for nova_project, all it does is fail')
- end
-
-end
View
21 modules/nova/lib/puppet/provider/nova_project/nova_manage.rb
@@ -1,21 +0,0 @@
-Puppet::Type.type(:nova_project).provide(:nova_manage) do
-
- desc "Manage nova project"
-
- defaultfor :kernel => 'Linux'
-
- commands :nova_manage => 'nova-manage'
-
- def exists?
- nova_manage("project", "list").match(/^#{resource[:name]}$/)
- end
-
- def create
- nova_manage("project", "create", resource[:name], resource[:owner])
- end
-
- def destroy
- nova_manage("project", "delete", resource[:name])
- end
-
-end
View
11 modules/nova/lib/puppet/type/nova_admin.rb
@@ -1,11 +0,0 @@
-Puppet::Type.newtype(:nova_admin) do
-
- @doc = "Manage creation/deletion of nova admin users."
-
- ensurable
-
- newparam(:name, :namevar => true) do
- desc "The name of the admins."
- end
-
-end
View
21 modules/nova/lib/puppet/type/nova_project.rb
@@ -1,21 +0,0 @@
-Puppet::Type.newtype(:nova_project) do
-
- @doc = "Manage creation/deletion of nova projects."
-
- ensurable
-
- newparam(:name, :namevar => true) do
- desc "The name of the project."
- end
-
- newparam(:owner) do
- desc "Owner of this project. *This is only set on project creation*"
- end
-
- # newproperty(:owner) - this needs to be a property
-
- autorequire(:nova_admin) do
- [self[:owner]]
- end
-
-end
View
13 modules/nova/manifests/all.pp
@@ -26,9 +26,6 @@
$glance_host = 'localhost',
$glance_port = '9292',
- $admin_user = 'novaadmin',
- $project_name = 'nova',
-
$verbose = undef
) {
@@ -85,15 +82,9 @@
host => $db_host,
}
- nova::manage::admin { $admin_user: }
- nova::manage::project { $project_name:
- owner => $admin_user,
- }
-
- nova::manage::network { "${project_name}-net-${nova_network}":
+ nova::manage::network { "net-${nova_network}":
network => $nova_network,
- available_ips => $available_ips,
- require => Nova::Manage::Project[$project_name],
+ available_ips => $available_ips
}
# set up glance server
View
18 modules/nova/manifests/controller.pp
@@ -42,9 +42,6 @@
$glance_host = undef,
$glance_port = undef,
- $admin_user = 'novaadmin',
- $project_name = 'nova',
-
$verbose = undef,
$allow_resize_to_same_host = false,
$libvirt_wait_soft_reboot_seconds = 120,
@@ -112,20 +109,13 @@
class { "nova::scheduler": enabled => true }
- nova::manage::admin { $admin_user: }
- nova::manage::project { $project_name:
- owner => $admin_user,
- }
-
- nova::manage::network { "${project_name}-net-${nova_network}":
+ nova::manage::network { "net-${nova_network}":
network => $nova_network,
- available_ips => $available_ips,
- require => Nova::Manage::Project[$project_name],
+ available_ips => $available_ips
}
- nova::manage::floating { "${project_name}-floating-${floating_network}":
- network => $floating_network,
- require => Nova::Manage::Project[$project_name],
+ nova::manage::floating { "floating-${floating_network}":
+ network => $floating_network
}
}
View
11 modules/nova/manifests/manage/admin.pp
@@ -1,11 +0,0 @@
-define nova::manage::admin {
-
- File['/etc/nova/nova.conf'] -> Nova_admin[$name]
- Exec<| title == 'initial-db-sync' |> -> Nova_admin[$name]
-
- nova_admin{ $name:
- ensure => present,
- provider => 'nova_manage',
- notify => Exec["nova-db-sync"],
- }
-}
View
13 modules/nova/manifests/manage/project.pp
@@ -1,13 +0,0 @@
-define nova::manage::project ( $owner ) {
-
- File['/etc/nova/nova.conf'] -> Nova_project[$name]
- Exec<| title == 'initial-db-sync' |> -> Nova_project[$name]
-
- nova_project { $name:
- ensure => present,
- provider => 'nova_manage',
- owner => $owner,
- notify => Exec["nova-db-sync"],
- require => Nova::Manage::Admin[$owner],
- }
-}

0 comments on commit 6093a63

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