From 9c2757e528b273275b78cbdd13bd0af0842e8da8 Mon Sep 17 00:00:00 2001 From: Manuel Torrinha Date: Tue, 4 Jun 2019 17:18:58 +0100 Subject: [PATCH] Removes admin endpoint references Also fixes wrong service type reference in for wsgi banner Change-Id: I82c60b7c4efaa19459a3a0ab835eb4e48f8ee991 Signed-off-by: Manuel Torrinha --- attributes/default.rb | 2 +- recipes/identity_registration.rb | 1 - spec/identity_registration_spec.rb | 2 +- templates/default/wsgi-template.conf.erb | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 71ac1a8..b321f20 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -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' diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb index f64b151..340770c 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -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'] diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb index ff45034..98340f8 100644 --- a/spec/identity_registration_spec.rb +++ b/spec/identity_registration_spec.rb @@ -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 diff --git a/templates/default/wsgi-template.conf.erb b/templates/default/wsgi-template.conf.erb index 564bfc8..ecf379b 100644 --- a/templates/default/wsgi-template.conf.erb +++ b/templates/default/wsgi-template.conf.erb @@ -1,4 +1,4 @@ -<%= node["openstack"]["compute"]["custom_template_banner"] %> +<%= node["openstack"]["block-storage"]["custom_template_banner"] %> Listen <%= @params[:server_host] %>:<%= @params[:server_port] %>