From 26617a72ab3b3ba7ee541aafe2f9e845a37c18ee Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Wed, 25 Jan 2017 14:00:13 -0700
Subject: [PATCH] Run nova cell v2 setup

Cells are being required so we need to setup the default cell.

Change-Id: I119353e5edf343d704ad961b21c5aa466eb7d54d
Depends-On: I591b451197dc3bd0783978f5e3d2b1c830afe54e
---
 manifests/nova.pp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/manifests/nova.pp b/manifests/nova.pp
index 45c96c13a..4f9da920e 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -64,15 +64,11 @@ class openstack_integration::nova (
   }
   class { '::nova::db::mysql_api':
     password    => 'nova',
-    #TODO(aschultz): remove this once it becomes default
-    #TODO(emilien): enable it again when it's fixed upstream in nova
-    # https://bugs.launchpad.net/tripleo/+bug/1649341
-    setup_cell0 => false,
   }
-  #TODO(emilien): enable it again when it's fixed upstream in nova
-  #class { '::nova::db::sync_cell_v2':
-  #  transport_url => $transport_url,
-  #}
+  # TODO(aschultz): when Ubuntu supports cells (ocata-m3) enable this
+  if $::osfamily == 'RedHat' {
+    include ::nova::cell_v2::simple_setup
+  }
   class { '::nova::db::mysql_placement':
     password => 'nova',
   }