openstack/cookbook-openstack-image
Code Issues Proposed changes

Chef 16 updates

Browse Source 
Depends-On: https://review.opendev.org/749849
Change-Id: I80dd2cfd30d62ee1a7b8a261504b3a909e5c636c
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-08-22 21:09:41 -07:00
parent 5bd78bca83
commit 878aa87971
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -21,7 +21,7 @@ Requirements
============ ============
- Chef 15 or higher - Chef 15 or higher
- Chef Workstation 0.15.18 for testing (also includes Berkshelf for - Chef Workstation 20.8.111 for testing (also includes Berkshelf for
cookbook dependency resolution) cookbook dependency resolution)
Platform Platform

2
metadata.rb
View File

@ -3,7 +3,7 @@ maintainer 'openstack-chef'
maintainer_email 'openstack-discuss@lists.openstack.org' maintainer_email 'openstack-discuss@lists.openstack.org'
license 'Apache-2.0' license 'Apache-2.0'
description 'Installs and configures the Glance Image Registry and Delivery Service' description 'Installs and configures the Glance Image Registry and Delivery Service'
version '19.0.0' version '19.1.0'
%w(ubuntu redhat centos).each do |os| %w(ubuntu redhat centos).each do |os|
supports os supports os

3
recipes/api.rb
View File

@ -20,7 +20,6 @@
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
require 'uri'
class ::Chef::Recipe class ::Chef::Recipe
include ::Openstack include ::Openstack
@ -63,7 +62,7 @@ node.default['openstack']['image_api']['conf_secrets']
get_password 'service', 'openstack-image' get_password 'service', 'openstack-image'
identity_endpoint = internal_endpoint 'identity' identity_endpoint = internal_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s auth_url = identity_endpoint.to_s
db_user = node['openstack']['db']['image']['username'] db_user = node['openstack']['db']['image']['username']
db_pass = get_password 'db', 'glance' db_pass = get_password 'db', 'glance'

4
recipes/identity_registration.rb
View File

@ -21,14 +21,12 @@
# limitations under the License. # limitations under the License.
# #
require 'uri'
class ::Chef::Recipe class ::Chef::Recipe
include ::Openstack include ::Openstack
end end
identity_endpoint = internal_endpoint 'identity' identity_endpoint = internal_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s auth_url = identity_endpoint.to_s
interfaces = { interfaces = {
public: { url: public_endpoint('image_api') }, public: { url: public_endpoint('image_api') },

2
recipes/image_upload.rb
View File

@ -33,7 +33,7 @@ package 'curl' do
end end
identity_endpoint = public_endpoint 'identity' identity_endpoint = public_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s auth_url = identity_endpoint.to_s
# admin_user = node['openstack']['image_api']['conf']['keystone_authtoken']['username'] # admin_user = node['openstack']['image_api']['conf']['keystone_authtoken']['username']
# admin_pass = get_password admin_user, admin_pass # admin_pass = get_password admin_user, admin_pass

2
recipes/swift_store.rb
View File

@ -29,7 +29,7 @@ platform_options['swift_packages'].each do |pkg|
end end
identity_endpoint = public_endpoint 'identity' identity_endpoint = public_endpoint 'identity'
swift_store_auth_address = ::URI.decode identity_endpoint.to_s swift_store_auth_address = identity_endpoint.to_s
tenant = node['openstack']['image_api']['conf']['keystone_authtoken']['project'] tenant = node['openstack']['image_api']['conf']['keystone_authtoken']['project']
user = node['openstack']['image_api']['conf']['keystone_authtoken']['user'] user = node['openstack']['image_api']['conf']['keystone_authtoken']['user']
swift_store_user = "#{tenant}_#{user}" swift_store_user = "#{tenant}_#{user}"