diff --git a/manifests/ec2api.pp b/manifests/ec2api.pp
index 3d2a143d1..d7aaf70c8 100644
--- a/manifests/ec2api.pp
+++ b/manifests/ec2api.pp
@@ -6,9 +6,9 @@ class openstack_integration::ec2api {
   include openstack_integration::params
 
   class { 'ec2api::keystone::auth':
-    public_url   => "${::openstack_integration::config::base_url}:8788",
-    internal_url => "${::openstack_integration::config::base_url}:8788",
-    admin_url    => "${::openstack_integration::config::base_url}:8788",
+    public_url   => "http://${::openstack_integration::config::ip_for_url}:8788",
+    internal_url => "http://${::openstack_integration::config::ip_for_url}:8788",
+    admin_url    => "http://${::openstack_integration::config::ip_for_url}:8788",
     password     => 'a_big_secret',
   }
   class { 'ec2api::db::mysql':
@@ -35,10 +35,16 @@ class openstack_integration::ec2api {
         memcached_servers    => $::openstack_integration::config::memcached_servers,
       }
       class { 'ec2api::api':
+        my_ip                   => $::openstack_integration::config::host,
+        ec2_host                => $::openstack_integration::config::host,
+        ec2api_listen           => $::openstack_integration::config::host,
         keystone_ec2_tokens_url => "${::openstack_integration::config::keystone_auth_uri}/v3/ec2tokens",
         external_network        => 'public',
       }
-      include ec2api::metadata
+      class { 'ec2api::metadata':
+        nova_metadata_ip => $::openstack_integration::config::host,
+        metadata_listen  => $::openstack_integration::config::host,
+      }
     }
     'Debian': {
       warning('ec2api is not yet packaged on Ubuntu systems.')
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index 9c668749b..dbd3d98bd 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -343,6 +343,10 @@ class openstack_integration::tempest (
     l2gw_switch                        => $l2gw_switch,
     disable_dashboard_ssl_validation   => true,
     ec2api_tester_roles                => ['member'],
+    aws_ec2_url                        => "http://${::openstack_integration::config::ip_for_url}:8788/",
+    aws_region                         => 'regionOne',
+    # TODO(tkajinam): we have to configure image id parameters but we have to
+    #                 obtain id from EC2 api.
     heat_image_name                    => 'cirros',
     heat_flavor_ref                    => '84',
     baremetal_driver                   => 'fake-hardware',