Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure Openstack uses its own CinderManager #242

Merged
merged 3 commits into from
Apr 10, 2018
Merged

Ensure Openstack uses its own CinderManager #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec1c935
Ensure the Openstack provider uses the Openstack cinder manager
mansam Feb 28, 2018
b50d1f4
Use Openstack-specific Cinder mixin
mansam Apr 5, 2018
c25ab93
Update VCRs
mansam Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/manageiq/providers/openstack/cloud_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ManageIQ::Providers::Openstack::CloudManager < ManageIQ::Providers::CloudM
:class_name => "ManageIQ::Providers::StorageManager",
:autosave => true

include CinderManagerMixin
include ManageIQ::Providers::Openstack::CinderManagerMixin
include SwiftManagerMixin
include ManageIQ::Providers::Openstack::ManagerMixin
include ManageIQ::Providers::Openstack::IdentitySyncMixin
Expand Down Expand Up @@ -77,7 +77,7 @@ def ensure_network_manager

def ensure_cinder_manager
return false if cinder_manager
build_cinder_manager(:type => 'ManageIQ::Providers::StorageManager::CinderManager')
build_cinder_manager(:type => 'ManageIQ::Providers::Openstack::StorageManager::CinderManager')
true
end

Expand Down
1 change: 1 addition & 0 deletions ...models/manageiq/providers/openstack/inventory/persister/storage_manager/cinder_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ def initialize_inventory_collections

add_inventory_collections(cloud,
%i(
vms
availability_zones
hardwares
cloud_tenants
Expand Down
Loading