diff options
| author |   Yanis Guenane <yguenane@redhat.com> | 2015-10-02 12:18:08 +0200 |
|---|---|---|
| committer |   Giulio Fidente <gfidente@redhat.com> | 2015-11-03 11:48:03 +0100 |
| commit | b60e8f79a26564b567f7620727428da50d7815b5 (patch) | |
| tree | 0a1fdb8d66d1dcf973a123c569a6c031c171e791 /puppet/hieradata | |
| parent | 04327663a90fdb2caa963b21072e599a66e61d05 (diff) | |
Create keystone roles and admin user from t-h-t manifests
Currently keystone initialization happens via os-cloud-config [1].
This commit moves some of that directly into the manifests. This is the
first in a series of two changes to migrate it entirely into t-h-t.
This change focus on implementing what keystone.initialize() was doing
on the tripleoclient [2], creates the admin tenant, user and roles.
It also creates the keystone endpoint itself.
1. https://github.com/openstack/os-cloud-config/blob/master/os_cloud_config/keystone.py#L128-L158
2. https://github.com/openstack/python-tripleoclient/blob/master/tripleoclient/v1/overcloud_deploy.py#L462-L527
Change-Id: I98555b707ff9b91c6e218de5dca68106ea05c8ea
Depends-On: Ia4b3244f114dcff746ab89d355ad4933f8fdbddf
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/controller.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index bc135260..81ee7cfb 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -42,6 +42,8 @@ heat::keystone_tenant: 'service' # keystone keystone::cron::token_flush::maxdelay: 3600 +keystone::roles::admin::service_tenant: 'service' +keystone::roles::admin::admin_tenant: 'admin' #swift swift::proxy::pipeline: |