Add os_endpoint_type attribute to ceilometer.conf

Change-Id: Iaf1590d7a7bec4191429a73895b9eecb65bfd367
Closes-bug: #1519218

attributes/default.rb

@@ -66,6 +66,10 @@ default['openstack']['telemetry']['service-credentials']['cafile'] = nil
 # Verify HTTPS connections (for service polling authentication)
 default['openstack']['telemetry']['service-credentials']['insecure'] = false
 
+# Type of endpoint in Identity service catalog to use for
+# communication with OpenStack services. (string value)
+default['openstack']['telemetry']['service-credentials']['os_endpoint_type'] = 'publicURL'
+
 default['openstack']['telemetry']['sample_source'] = 'openstack'
 
 default['openstack']['telemetry']['dbsync_timeout'] = 3600

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'openstack-dev@lists.openstack.org'
 license 'Apache 2.0'
 description 'The OpenStack Metering service Ceilometer.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '12.0.0'
+version '12.1.0'
 
 recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
 recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'

spec/common_spec.rb

@@ -239,6 +239,10 @@ describe 'openstack-telemetry::common' do
           expect(chef_run).not_to render_file(file.name).with_content(/^os_cacert = $/)
         end
 
+        it 'sets os_endpoint_type' do
+          expect(chef_run).to render_config_file(file.name).with_section_content('service_credentials', /^os_endpoint_type = publicURL$/)
+        end
+
         it 'sets insecure' do
           expect(chef_run).to render_file(file.name).with_content(/^insecure = false$/)
         end

templates/default/ceilometer.conf.erb

@@ -191,6 +191,10 @@ os_region_name = <%= node['openstack']['telemetry']['region'] %>
 os_cacert = <%= node['openstack']['telemetry']['service-credentials']['cafile'] %>
 <% end %>
 
+# Type of endpoint in Identity service catalog to use for
+# communication with OpenStack services. (string value)
+os_endpoint_type = <%= node['openstack']['telemetry']['service-credentials']['os_endpoint_type'] %>
+
 # Verify HTTPS connections. (boolean value, for service polling authentication)
 insecure = <%= node['openstack']['telemetry']['service-credentials']['insecure'] %>