Skip to content

Commit

Permalink
Remove common::glance
Browse files Browse the repository at this point in the history
The glance::api class is not common, it should only be used on the
glance api server. We move it to the api profile and remove the common
class.
  • Loading branch information
Colleen Murphy committed Apr 24, 2015
1 parent 260ead5 commit a6f0803
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 29 deletions.
27 changes: 0 additions & 27 deletions manifests/common/glance.pp

This file was deleted.

13 changes: 12 additions & 1 deletion manifests/profile/glance/api.pp
Expand Up @@ -16,7 +16,18 @@
openstack::resources::firewall { 'Glance API': port => '9292', }
openstack::resources::firewall { 'Glance Registry': port => '9191', }

include ::openstack::common::glance
class { '::glance::api':
keystone_password => $::openstack::config::glance_password,
auth_host => $::openstack::config::controller_address_management,
keystone_tenant => 'services',
keystone_user => 'glance',
database_connection => $database_connection,
registry_host => $::openstack::config::storage_address_management,
verbose => $::openstack::config::verbose,
debug => $::openstack::config::debug,
enabled => $::openstack::profile::base::is_storage,
os_region_name => $::openstack::config::region,
}

class { '::glance::backend::file': }

Expand Down
1 change: 0 additions & 1 deletion manifests/profile/glance/auth.pp
Expand Up @@ -12,5 +12,4 @@
region => $::openstack::config::region,
}

include ::openstack::common::glance
}

0 comments on commit a6f0803

Please sign in to comment.