Merge "Explicitly set auth_strategy"

attributes/default.rb

@@ -27,6 +27,7 @@ default['openstack']['network']['custom_template_banner'] = '
 
 default['openstack']['network']['verbose'] = 'False'
 default['openstack']['network']['debug'] = 'False'
+default['openstack']['network']['auth_strategy'] = 'keystone'
 
 # Gets set in the Network Endpoint when registering with Keystone
 default['openstack']['network']['region'] = 'RegionOne'

spec/server_spec.rb

@@ -136,6 +136,11 @@ describe 'openstack-network::server' do
         'agent_down_time = 15')
     end
 
+    it 'it sets auth_strategy correctly' do
+      expect(@chef_run).to render_file(@file.name).with_content(
+        'auth_strategy = keystone')
+    end
+
     it 'it sets agent report interval correctly' do
       expect(@chef_run).to render_file(@file.name).with_content(
         'report_interval = 4')

templates/default/neutron.conf.erb

@@ -65,6 +65,7 @@ api_paste_config = api-paste.ini
 # The strategy to be used for auth.
 # Supported values are 'keystone'(default), 'noauth'.
 # auth_strategy = keystone
+auth_strategy = <%= node["openstack"]["network"]['auth_strategy'] %>
 
 # Base MAC address. The first 3 octets will remain unchanged. If the
 # 4h octet is not 00, it will also used. The others will be