heat: ensure admin has heat_stack_owner role

To avoid a bug in Heat [1], ensure "admin" user from "admin" tenant has
"heat_stack_owner" role.

[1] https://bugs.launchpad.net/heat/
Allow to dedicate a journal by OSD.

The device name for an OSD or for a journal can be specified as a
full-qualifed name (eg. /dev/sde) or a short-qualifed device name (eg.
sde).
Merge pull request #707 from enovance/AlexandreNo/ceph_journal_osd

Allow to dedicate a journal by OSD.
dashboard: Allow override of neutron_options

When using specific neutron driver like cisco n1kv we need to have cisco
profile enable in horizon.
This patch allow to override neutron_options in horizon class in order to
enable cisco profile.
It's also useful when we need to activate vpnaas or fwaas in the dashboard.

https://blueprints.launchpad.net/horizon/+spec/horizon-cisco-n1k

Signed-off-by: Dimitri Savineau <dimitri.savineau@enovance.com>
Merge pull request #706 from enovance/heat_role

heat: ensure admin has heat_stack_owner role
Merge pull request #703 from dsavineau/horizon-cisco-plugin

dashboard: Allow override of neutron_options
dashboard: Fix merge parameters

When there is a duplicate key, the key in the rightmost hash will "win."
Currently extra_params default values can never be overriden by
vhost_extra_params if we have duplicate key.
This patch allows it.

https://forge.puppetlabs.com/puppetlabs/stdlib#merge

Signed-off-by: Dimitri Savineau <dimitri.savineau@enovance.com>
Puppetfile: Update puppet-ceph refs

Fix osd uuid detection

Signed-off-by: Dimitri Savineau <dimitri.savineau@enovance.com>
Merge pull request #709 from dsavineau/update-ceph-refs

Puppetfile: Update puppet-ceph refs
Merge pull request #708 from dsavineau/fix-merge-params

dashboard: Fix merge parameters
Revert "heat: ensure admin has heat_stack_owner role"

This reverts commit a6416cc98563f016f17302c52361a3e40ff19812.
Merge pull request #710 from enovance/revert_heat_keystone

Revert "heat: ensure admin has heat_stack_owner role"