installing puppetdb and puppetmaster at the same time fails

[iverberk]

I'm trying to create a Puppet manifest that will install the puppetmaster package/service and PuppetDB for me at the same time. It seems this is not possible because of a dependency cycle issue. Basically I want the puppetdb and puppetdb::master::config class to depend on a started puppetmaster service. This however results in a dependency cycle because of the following code: http://pastebin.com/b75MUCsk

The puppetmaster needs to be started to create the certificates which are required by the puppetdb class to create a keystore.

Any suggestions/tips/fixes are welcome since I don't see a proper solution yet. I'm using this manifest file on a clean CentOS 6.4: http://pastebin.com/95tcv1Jj