Merge "Keystone configures parameter of admin project."
diff --git a/README.rst b/README.rst
index bb7146f..89593bd 100644
--- a/README.rst
+++ b/README.rst
@@ -664,6 +664,18 @@
policy:
admin_or_token_subject: 'rule:admin_required or rule:token_subject'
+Setting up default admin project name and domain
+
+.. code-block:: yaml
+
+
+ keystone:
+ server:
+ ....
+ admin_project:
+ name: "admin"
+ domain: "default"
+
Usage
=====
diff --git a/keystone/files/ocata/keystone.conf.Debian b/keystone/files/ocata/keystone.conf.Debian
index 59b1cff..c15982f 100644
--- a/keystone/files/ocata/keystone.conf.Debian
+++ b/keystone/files/ocata/keystone.conf.Debian
@@ -2612,6 +2612,9 @@
# Name of the domain that owns the `admin_project_name`. If left unset, then
# there is no admin project. `[resource] admin_project_name` must also be set
# to use this option. (string value)
+{%- if server.admin_project is defined %}
+admin_project_domain_name = {{ server.admin_project.domain }}
+{%- endif %}
#admin_project_domain_name = <None>
# This is a special project which represents cloud-level administrator
@@ -2622,6 +2625,9 @@
# means of cross-project role assignments. `[resource]
# admin_project_domain_name` must also be set to use this option. (string
# value)
+{%- if server.admin_project is defined %}
+admin_project_name = {{ server.admin_project.name }}
+{%- endif %}
#admin_project_name = <None>
# This controls whether the names of projects are restricted from containing
diff --git a/keystone/files/ocata/keystone.conf.RedHat b/keystone/files/ocata/keystone.conf.RedHat
index 663854e..7f4d9f1 100644
--- a/keystone/files/ocata/keystone.conf.RedHat
+++ b/keystone/files/ocata/keystone.conf.RedHat
@@ -2560,6 +2560,9 @@
# Name of the domain that owns the `admin_project_name`. If left unset, then
# there is no admin project. `[resource] admin_project_name` must also be set
# to use this option. (string value)
+{%- if server.admin_project is defined %}
+admin_project_domain_name = {{ server.admin_project.domain }}
+{%- endif %}
#admin_project_domain_name = <None>
# This is a special project which represents cloud-level administrator
@@ -2570,6 +2573,9 @@
# means of cross-project role assignments. `[resource]
# admin_project_domain_name` must also be set to use this option. (string
# value)
+{%- if server.admin_project is defined %}
+admin_project_name = {{ server.admin_project.name }}
+{%- endif %}
#admin_project_name = <None>
# This controls whether the names of projects are restricted from containing
@@ -3058,4 +3064,4 @@
# unless you are providing a custom entry point. (string value)
#driver = sql
[extra_headers]
-Distribution = Ubuntu
\ No newline at end of file
+Distribution = Ubuntu