Move keystone::auth into service_config_settings
authorDan Prince <dprince@redhat.com>
Thu, 15 Sep 2016 07:19:15 +0000 (09:19 +0200)
committerDan Prince <dprince@redhat.com>
Fri, 23 Sep 2016 11:43:21 +0000 (07:43 -0400)
commit9d67d7b3b11b688be0b40fc2fcfb1daf5b5157df
tree528b9bc390e8b4997eeaa8f0f32f027791851387
parentf9d6db86edd89efe59fe0db9564ebfae05954788
Move keystone::auth into service_config_settings

This patch moves the keystone::auth settings for all
services into the new service_config_settings section. This
is important because we execute the keystone commands via
puppet only on the role containing the keystone service
and without these settings it will fail.

Note that yaql merging/filtering is used here to ensure that
service_config_settings is optional in service templates,
and also that we'll only deploy hieradata for a given
service on a node running the service (the key in
the service_config_settings map must match the service_name
in the service template for this to work).

e.g the following will result in only deploying keystone: 123
in hiera on the role running the "keystone" service,
regardless of which service template defines it.

  service_config_settings:
    keystone:
      keystone: 123

Co-Authored-By: Steven Hardy <shardy@redhat.com>
Change-Id: I0c2fce037a1a38772f998d582a816b4b703f8265
Closes-bug: 1620829
19 files changed:
overcloud.j2.yaml
puppet/services/aodh-api.yaml
puppet/services/aodh-base.yaml
puppet/services/ceilometer-api.yaml
puppet/services/ceilometer-base.yaml
puppet/services/ceph-rgw.yaml
puppet/services/cinder-api.yaml
puppet/services/glance-api.yaml
puppet/services/gnocchi-api.yaml
puppet/services/heat-api-cfn.yaml
puppet/services/heat-api.yaml
puppet/services/ironic-api.yaml
puppet/services/manila-api.yaml
puppet/services/neutron-api.yaml
puppet/services/nova-api.yaml
puppet/services/sahara-api.yaml
puppet/services/sahara-base.yaml
puppet/services/services.yaml
puppet/services/swift-proxy.yaml