diff --git a/heat/engine/resources/openstack/trove/trove_cluster.py b/heat/engine/resources/openstack/trove/trove_cluster.py
index bca16443c3..494b88f1ef 100644
--- a/heat/engine/resources/openstack/trove/trove_cluster.py
+++ b/heat/engine/resources/openstack/trove/trove_cluster.py
@@ -124,7 +124,7 @@ class TroveCluster(resource.Resource):
             type=attributes.Schema.LIST
         ),
         IP: attributes.Schema(
-            _("IP of the cluster."),
+            _("A list of cluster instance IPs."),
             type=attributes.Schema.LIST
         )
     }
diff --git a/heat/tests/test_trove_cluster.py b/heat/tests/test_trove_cluster.py
index b51124e7ee..26eb2ba3e8 100644
--- a/heat/tests/test_trove_cluster.py
+++ b/heat/tests/test_trove_cluster.py
@@ -48,7 +48,7 @@ class FakeTroveCluster(object):
     def __init__(self, status='ACTIVE'):
         self.name = 'cluster'
         self.id = '1189aa64-a471-4aa3-876a-9eb7d84089da'
-        self.ip = '10.0.0.1'
+        self.ip = ['10.0.0.1']
         self.instances = [
             {'id': '416b0b16-ba55-4302-bbd3-ff566032e1c1', 'status': status},
             {'id': '965ef811-7c1d-47fc-89f2-a89dfdd23ef2', 'status': status},
@@ -124,7 +124,7 @@ class TroveClusterTest(common.HeatTestCase):
 
     def test_attributes(self):
         tc = self._create_resource('cluster', self.rsrc_defn, self.stack)
-        self.assertEqual('10.0.0.1', tc.FnGetAtt('ip'))
+        self.assertEqual(['10.0.0.1'], tc.FnGetAtt('ip'))
         self.assertEqual(['416b0b16-ba55-4302-bbd3-ff566032e1c1',
                           '965ef811-7c1d-47fc-89f2-a89dfdd23ef2',
                           '3642f41c-e8ad-4164-a089-3891bf7f2d2b'],