[detach-database] and [detach-keystone] fail to deploy when primary controller node has more than one role

Basically due to hiera-override.pp in both [detached keystone] and [detached database] primary controller becomes not-primary in case it has some other roles which leads to fails in l3/dhcp agent pacemaker manifests.

This is where the magic happens:
$roles = join(hiera('roles'), ',')
  case $roles {
    /primary-standalone-keystone/: {
      $primary_keystone = true
      $primary_controller = true
    }
    /^primary/: {
      $primary_keystone = false
      $primary_controller = true
    }
    default: {
      $primary_database = false
      $primary_controller = false
    }
  }

In my case:
hiera roles
["ceph-osd", "primary-controller"]

so after override is done:
hiera primary_controller
false

Description of the environment:
{"release": "9.0", "auth_required": true, "api": "1", "openstack_version": "mitaka-9.0", "feature_groups": ["experimental", "advanced"]}

detach-database 1.1.0 3.0.0 ubuntu (mitaka-9.0)
detach-keystone 1.0.2 3.0.0 ubuntu (mitaka-9.0)

nodes:
3 keystone + database
1 controller + ceph-osd
1 compute

Impact:
Deployment cannot be completed though it's easy work it around

Workaround:
  Fix hiera-override.pp case model