From a9bfbaab9a7894a21abcd9ec4d6d550faa924800 Mon Sep 17 00:00:00 2001
From: wenchma <wenchma@cn.ibm.com>
Date: Thu, 30 Apr 2015 14:47:34 +0800
Subject: [PATCH] Add neutron url attribute for ironic

Change-Id: I46f5de1bcff5735f37e75deca931f59aa3ff0c81
Closes-bug: #1450323
---
 recipes/ironic-common.rb          | 3 +++
 spec/ironic-common_spec.rb        | 4 ++++
 templates/default/ironic.conf.erb | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/recipes/ironic-common.rb b/recipes/ironic-common.rb
index bd71d58..bc41445 100644
--- a/recipes/ironic-common.rb
+++ b/recipes/ironic-common.rb
@@ -70,6 +70,8 @@ service_pass = get_password 'service', 'openstack-bare-metal'
 auth_uri = auth_uri_transform(identity_endpoint.to_s, node['openstack']['bare-metal']['api']['auth']['version'])
 identity_uri = identity_uri_transform(identity_admin_endpoint)
 
+network_endpoint = internal_endpoint 'network-api' || {}
+
 template '/etc/ironic/ironic.conf' do
   source 'ironic.conf.erb'
   owner node['openstack']['bare-metal']['user']
@@ -80,6 +82,7 @@ template '/etc/ironic/ironic.conf' do
     mq_service_type: mq_service_type,
     mq_password: mq_password,
     rabbit_hosts: rabbit_hosts,
+    network_endpoint: network_endpoint,
     glance_protocol: image_endpoint.scheme,
     glance_host: image_endpoint.host,
     glance_port: image_endpoint.port,
diff --git a/spec/ironic-common_spec.rb b/spec/ironic-common_spec.rb
index 953cbad..07df965 100644
--- a/spec/ironic-common_spec.rb
+++ b/spec/ironic-common_spec.rb
@@ -97,6 +97,10 @@ describe 'openstack-bare-metal::ironic-common' do
         end
       end
 
+      it 'has default neutron attributes' do
+        expect(chef_run).to render_config_file(file.name).with_section_content('neutron', %r(^url=http://127.0.0.1:9696$))
+      end
+
       context 'tftp' do
         before do
           node.set['openstack']['bare-metal']['tftp']['enabled'] = true
diff --git a/templates/default/ironic.conf.erb b/templates/default/ironic.conf.erb
index 021ad67..72f528e 100644
--- a/templates/default/ironic.conf.erb
+++ b/templates/default/ironic.conf.erb
@@ -1118,7 +1118,7 @@ signing_dir=<%= node['openstack']['bare-metal']['api']['auth']['cache_dir'] %>
 #
 
 # URL for connecting to neutron. (string value)
-#url=http://$my_ip:9696
+url=<%= @network_endpoint %>
 
 # Timeout value for connecting to neutron in seconds. (integer
 # value)