Style and lint fixes to support newer ChefDK
Change-Id: I39f35c718e706b8f29c2b4d6d6cbd270b510183e
Depends-On: I0a3872cd3a21c31b5e3a7b6190f911280e9ed909
Depends-On: I34e4c7b29ff7c36c91245d90fb0b6897847cd22f
(cherry picked from commit 67149f00ff
)
This commit is contained in:
parent
3ee7bd2c94
commit
fe77b8f626
|
@ -13,8 +13,8 @@ Requirements
|
|||
============
|
||||
|
||||
- Chef 12 or higher
|
||||
- chefdk 0.9.0 for testing (also includes berkshelf for cookbook dependency
|
||||
resolution)
|
||||
- chefdk 0.9.0 or higher for testing (also includes berkshelf for cookbook
|
||||
dependency resolution)
|
||||
|
||||
Platform
|
||||
========
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
name 'openstack-block-storage'
|
||||
maintainer 'openstack-chef'
|
||||
maintainer_email 'openstack-dev@lists.openstack.org'
|
||||
issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
|
||||
source_url 'https://github.com/openstack/cookbook-openstack-block-storage' if respond_to?(:source_url)
|
||||
license 'Apache 2.0'
|
||||
description 'The OpenStack Advanced Volume Management service Cinder.'
|
||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||
|
|
|
@ -83,26 +83,26 @@ end
|
|||
openstack_identity_register 'Register Cinder V1 Volume Service' do
|
||||
auth_uri auth_uri
|
||||
bootstrap_token bootstrap_token
|
||||
service_name ((service_name).gsub(/v2/, ''))
|
||||
service_type ((service_type).gsub(/v2/, ''))
|
||||
service_name (service_name.gsub(/v2/, ''))
|
||||
service_type (service_type.gsub(/v2/, ''))
|
||||
service_description 'Cinder Volume Service V1'
|
||||
endpoint_region region
|
||||
endpoint_adminurl ((::URI.decode admin_cinder_api_endpoint.to_s).gsub(/v2/, 'v1'))
|
||||
endpoint_internalurl ((::URI.decode internal_cinder_api_endpoint.to_s).gsub(/v2/, 'v1'))
|
||||
endpoint_publicurl ((::URI.decode public_cinder_api_endpoint.to_s).gsub(/v2/, 'v1'))
|
||||
endpoint_adminurl (::URI.decode admin_cinder_api_endpoint.to_s.gsub(/v2/, 'v1'))
|
||||
endpoint_internalurl (::URI.decode internal_cinder_api_endpoint.to_s.gsub(/v2/, 'v1'))
|
||||
endpoint_publicurl (::URI.decode public_cinder_api_endpoint.to_s.gsub(/v2/, 'v1'))
|
||||
action :create_service
|
||||
end
|
||||
|
||||
openstack_identity_register 'Register Cinder V1 Volume Endpoint' do
|
||||
auth_uri auth_uri
|
||||
bootstrap_token bootstrap_token
|
||||
service_name ((service_name).gsub(/v2/, ''))
|
||||
service_type ((service_type).gsub(/v2/, ''))
|
||||
service_name (service_name.gsub(/v2/, ''))
|
||||
service_type (service_type.gsub(/v2/, ''))
|
||||
service_description 'Cinder Volume Service V1'
|
||||
endpoint_region region
|
||||
endpoint_adminurl ((::URI.decode admin_cinder_api_endpoint.to_s).gsub(/v2/, 'v1'))
|
||||
endpoint_internalurl ((::URI.decode internal_cinder_api_endpoint.to_s).gsub(/v2/, 'v1'))
|
||||
endpoint_publicurl ((::URI.decode public_cinder_api_endpoint.to_s).gsub(/v2/, 'v1'))
|
||||
endpoint_adminurl (::URI.decode admin_cinder_api_endpoint.to_s.gsub(/v2/, 'v1'))
|
||||
endpoint_internalurl (::URI.decode internal_cinder_api_endpoint.to_s.gsub(/v2/, 'v1'))
|
||||
endpoint_publicurl (::URI.decode public_cinder_api_endpoint.to_s.gsub(/v2/, 'v1'))
|
||||
action :create_endpoint
|
||||
end
|
||||
|
||||
|
|
|
@ -14,12 +14,12 @@ REDHAT_OPTS = {
|
|||
platform: 'redhat',
|
||||
version: '7.1',
|
||||
log_level: LOG_LEVEL
|
||||
}
|
||||
}.freeze
|
||||
UBUNTU_OPTS = {
|
||||
platform: 'ubuntu',
|
||||
version: '14.04',
|
||||
log_level: LOG_LEVEL
|
||||
}
|
||||
}.freeze
|
||||
|
||||
shared_context 'block-storage-stubs' do
|
||||
before do
|
||||
|
|
Loading…
Reference in New Issue