diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e2e98c6..f557f542 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 This file is used to list changes made in each version of cookbook-openstack-common.
 
 
+## 10.4.0
+* Add nova metadata api endpoint
+
 ## 10.3.0
 * Updates for mysql cookbook ver 6.x
 
diff --git a/attributes/default.rb b/attributes/default.rb
index 2506d128..384613e7 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -296,6 +296,17 @@ default['openstack']['endpoints']['compute-vnc']['bind_interface'] = nil
 default['openstack']['endpoints']['compute-vnc-proxy-bind']['host'] = node['openstack']['endpoints']['compute-vnc-bind']['host']
 default['openstack']['endpoints']['compute-vnc-proxy-bind']['bind_interface'] = node['openstack']['endpoints']['compute-vnc-bind']['bind_interface']
 
+# The OpenStack Compute (Nova) metadata API endpoint
+default['openstack']['endpoints']['compute-metadata-api-bind']['host'] = node['openstack']['endpoints']['bind-host']
+default['openstack']['endpoints']['compute-metadata-api-bind']['port'] = '8775'
+default['openstack']['endpoints']['compute-metadata-api-bind']['bind_interface'] = node['openstack']['endpoints']['bind_interface']
+
+default['openstack']['endpoints']['compute-metadata-api']['host'] = node['openstack']['endpoints']['host']
+default['openstack']['endpoints']['compute-metadata-api']['scheme'] = 'http'
+default['openstack']['endpoints']['compute-metadata-api']['port'] = '8775'
+default['openstack']['endpoints']['compute-metadata-api']['path'] = nil
+default['openstack']['endpoints']['compute-metadata-api']['bind_interface'] = nil
+
 # ******************** OpenStack Network Endpoints ****************************
 
 # The OpenStack Network (Neutron) API endpoint.
diff --git a/metadata.rb b/metadata.rb
index 146e45a6..d2502b4f 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com'
 license          'Apache 2.0'
 description      'Common OpenStack attributes, libraries and recipes.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '10.3.0'
+version          '10.4.0'
 
 recipe           'openstack-common', 'Installs/Configures common recipes'
 recipe           'openstack-common::set_endpoints_by_interface', 'Set endpoints by interface'
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index 9f48fd28..e44c4b56 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -58,7 +58,7 @@ describe 'openstack-common::default' do
     it 'allows bind_interface override for all bind endpoints' do
       node.set['openstack']['endpoints']['bind_interface'] = 'eth1'
       %w{identity-bind identity-admin-bind compute-api-bind compute-ec2-api-bind compute-ec2-admin-bind
-         compute-xvpvnc-bind compute-novnc-bind compute-vnc-bind compute-vnc-proxy-bind
+         compute-xvpvnc-bind compute-novnc-bind compute-vnc-bind compute-vnc-proxy-bind compute-metadata-api-bind
          network-api-bind image-api-bind image-registry-bind block-storage-api-bind object-storage-api-bind
          telemetry-api-bind orchestration-api-bind orchestration-api-cfn-bind orchestration-api-cloudwatch-bind
          database-api-bind}.each do |endpoint|