Merge "Drop admin endpoints and cache dirs"

attributes/glance_api_conf.rb

@@ -18,6 +18,5 @@ default['openstack']['image_api']['conf'].tap do |conf|
   conf['keystone_authtoken']['username'] = 'glance'
   conf['keystone_authtoken']['project_name'] = 'admin'
   conf['keystone_authtoken']['user_domain_name'] = 'Default'
-  conf['keystone_authtoken']['signing_dir'] = '/var/cache/glance/api'
   conf['keystone_authtoken']['project_domain_name'] = 'Default'
 end

attributes/glance_registry_conf.rb

@@ -15,6 +15,5 @@ default['openstack']['image_registry']['conf'].tap do |conf|
   conf['keystone_authtoken']['username'] = 'glance'
   conf['keystone_authtoken']['project_name'] = 'service'
   conf['keystone_authtoken']['user_domain_name'] = 'Default'
-  conf['keystone_authtoken']['signing_dir'] = '/var/cache/glance/registry' # none in docs
   conf['keystone_authtoken']['project_domain_name'] = 'Default'
 end

recipes/api.rb

@@ -46,13 +46,6 @@ directory '/etc/glance' do
   mode 0o0700
 end
 
-directory node['openstack']['image_api']['conf']['keystone_authtoken']['signing_dir'] do
-  owner node['openstack']['image']['user']
-  group node['openstack']['image']['group']
-  mode 0o0700
-  recursive true
-end
-
 if node['openstack']['image_api']['conf']['glance_store']['default_store'] == 'file'
   node.default['openstack']['image_api']['conf']['glance_store']['filesystem_store_datadir'] =
     '/var/lib/glance/images'

recipes/identity_registration.rb

@@ -32,7 +32,6 @@ auth_url = ::URI.decode identity_endpoint.to_s
 interfaces = {
   public: { url: public_endpoint('image_api') },
   internal: { url: internal_endpoint('image_api') },
-  admin: { url: admin_endpoint('image_api') },
 }
 
 admin_user = node['openstack']['identity']['admin_user']
@@ -48,13 +47,15 @@ service_user =
 service_role = node['openstack']['image']['service_role']
 service_domain_name = node['openstack']['image_api']['conf']['keystone_authtoken']['user_domain_name']
 region = node['openstack']['region']
+endpoint_type = node['openstack']['identity']['endpoint_type']
 
 connection_params = {
-  openstack_auth_url:     "#{auth_url}/auth/tokens",
-  openstack_username:     admin_user,
-  openstack_api_key:      admin_pass,
-  openstack_project_name: admin_project,
-  openstack_domain_name:    admin_domain,
+  openstack_auth_url:      "#{auth_url}/auth/tokens",
+  openstack_username:      admin_user,
+  openstack_api_key:       admin_pass,
+  openstack_project_name:  admin_project,
+  openstack_domain_name:   admin_domain,
+  openstack_endpoint_type: endpoint_type,
 }
 
 # Register Image Service

recipes/registry.rb

@@ -66,13 +66,6 @@ platform_options['image_packages'].each do |pkg|
   end
 end
 
-directory node['openstack']['image_registry']['conf']['keystone_authtoken']['signing_dir'] do
-  owner glance_user
-  group glance_group
-  mode 0o0700
-  recursive true
-end
-
 file '/var/lib/glance/glance.sqlite' do
   action :delete
   not_if { node['openstack']['db']['image']['service_type'] == 'sqlite' }

spec/api_spec.rb

@@ -38,16 +38,6 @@ describe 'openstack-image::api' do
         )
     end
 
-    it do
-      expect(chef_run).to create_directory('/var/cache/glance/api')
-        .with(
-          user: 'glance',
-          group: 'glance',
-          mode: 0o0700,
-          recursive: true
-        )
-    end
-
     describe 'glance-api.conf' do
       let(:file) { chef_run.template('/etc/glance/glance-api.conf') }
       it do
@@ -101,7 +91,6 @@ describe 'openstack-image::api' do
           /^region_name = RegionOne$/,
           /^username = glance$/,
           /^project_name = admin$/,
-          %r{^signing_dir = /var/cache/glance/api$},
           %r{^auth_url = http://127.0.0.1:5000/v3$},
           /^password = glance-pass$/,
           /^user_domain_name = Default$/,

spec/identity_registration_spec.rb

@@ -16,6 +16,7 @@ describe 'openstack-image::identity_registration' do
     openstack_api_key: 'admin-pass',
     openstack_project_name: 'admin',
     openstack_domain_name: 'default',
+    openstack_endpoint_type: 'internalURL',
   }
   service_name = 'glance'
   service_type = 'image'
@@ -45,7 +46,7 @@ describe 'openstack-image::identity_registration' do
   end
 
   context "registers #{service_name} endpoint" do
-    %w(admin internal public).each do |interface|
+    %w(internal public).each do |interface|
       it "#{interface} endpoint with default values" do
         expect(chef_run).to create_openstack_endpoint(
           service_type

spec/registry_spec.rb

@@ -34,14 +34,6 @@ describe 'openstack-image::registry' do
       end
     end
 
-    it do
-      expect(chef_run).to create_directory('/var/cache/glance/registry').with(
-        user: 'glance',
-        group: 'glance',
-        mode: 0o0700
-      )
-    end
-
     it 'deletes glance.sqlite' do
       expect(chef_run).to delete_file('/var/lib/glance/glance.sqlite')
     end
@@ -92,7 +84,6 @@ describe 'openstack-image::registry' do
             /^region_name = RegionOne$/,
             /^username = glance$/,
             /^project_name = service/,
-            %r{^signing_dir = /var/cache/glance/registry},
             %r{^auth_url = http://127.0.0.1:5000/v3},
             /^user_domain_name = Default$/,
             /^password = glance-pass$/,

spec/spec_helper.rb

@@ -190,11 +190,6 @@ shared_examples 'keystone attribute setter' do |version|
   it 'sets the admin password attribute' do
     expect(chef_run).to render_file(file.name).with_content(/^admin_password = admin_password_value$/)
   end
-
-  it 'sets the signing dir attribute' do
-    node.override['openstack']["image-#{version}"]['conf']['keystone_authtoken']['signing_dir'] = 'cache_dir_value'
-    expect(chef_run).to render_file(file.name).with_content(/^signing_dir = cache_dir_value$/)
-  end
 end
 
 shared_examples 'messaging' do |version|