Use THT to define cell0 creation
authorAlex Schultz <aschultz@redhat.com>
Tue, 3 Jan 2017 21:19:45 +0000 (14:19 -0700)
committerDan Prince <dprince@redhat.com>
Mon, 9 Jan 2017 15:34:58 +0000 (10:34 -0500)
As part of the initial implementation, we hard coded the cell0 setup in
puppet. This change switches it to leverage the defined value in the
tripleo-heat-templates

Change-Id: I896a124d91d06ca85b77c9fbe24fd252815a2d28
Depends-On: I08119d781ef60750cc19753bc03190e413159925
Related-Bug: #1649341

manifests/profile/base/database/mysql.pp

index 634b615..54f6574 100644 (file)
@@ -232,10 +232,7 @@ class tripleo::profile::base::database::mysql (
       $messaging_use_ssl_real = sprintf('%s', bool2num(str2bool(
         pick($nova_messaging_use_ssl, hiera('nova::rabbit_user_ssl', '0')))))
 
-      # TODO(aschultz): switch this back to an include once setup_cell0 in THT
-      class { '::nova::db::mysql_api':
-        setup_cell0 => true,
-      }
+      include ::nova::db::mysql_api
       class { '::nova::db::sync_cell_v2':
         transport_url => os_transport_url({
           'transport' => $messaging_driver_real,