Removes admin endpoint references

Also fixes wrong service type reference in for wsgi banner

Change-Id: I82c60b7c4efaa19459a3a0ab835eb4e48f8ee991
Signed-off-by: Manuel Torrinha <manuel.torrinha@tecnico.ulisboa.pt>
This commit is contained in:
Manuel Torrinha 2019-06-04 17:18:58 +01:00 committed by Jens Harbott (frickler)
parent 6b92f6968c
commit 9c2757e528
4 changed files with 3 additions and 4 deletions

View File

@ -130,7 +130,7 @@ end
# ******************** OpenStack Volume Endpoints *****************************
# The OpenStack Volume (Cinder) API endpoint
%w(public internal admin).each do |ep_type|
%w(public internal).each do |ep_type|
default['openstack']['endpoints'][ep_type]['block-storage']['scheme'] = 'http'
default['openstack']['endpoints'][ep_type]['block-storage']['path'] = '/v2/%(tenant_id)s'
default['openstack']['endpoints'][ep_type]['block-storage']['host'] = '127.0.0.1'

View File

@ -32,7 +32,6 @@ auth_url = ::URI.decode identity_endpoint.to_s
interfaces = {
public: { url: public_endpoint('block-storage') },
internal: { url: internal_endpoint('block-storage') },
admin: { url: admin_endpoint('block-storage') },
}
service_pass = get_password 'service', 'openstack-block-storage'
region = node['openstack']['block-storage']['region']

View File

@ -57,7 +57,7 @@ describe 'openstack-block-storage::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

View File

@ -1,4 +1,4 @@
<%= node["openstack"]["compute"]["custom_template_banner"] %>
<%= node["openstack"]["block-storage"]["custom_template_banner"] %>
Listen <%= @params[:server_host] %>:<%= @params[:server_port] %>