Merge "Fix project_domain_name and user_domain_name in doc"

2017-11-29 20:05:30 +00:00 · 2017-11-29 20:05:30 +00:00 · e754da8180
commit e754da8180
parent 39b0b45054 8f7356dca6
6 changed files with 12 additions and 12 deletions
--- a/doc/source/install/cinder-controller-install-obs.rst
+++ b/doc/source/install/cinder-controller-install-obs.rst
@ -281,8 +281,8 @@ Install and configure components
         auth_url = http://controller:35357
         memcached_servers = controller:11211
         auth_type = password
-         project_domain_name = default
-         user_domain_name = default
+         project_domain_id = default
+         user_domain_id = default
         project_name = service
         username = cinder
         password = CINDER_PASS
--- a/doc/source/install/cinder-controller-install-rdo.rst
+++ b/doc/source/install/cinder-controller-install-rdo.rst
@ -280,8 +280,8 @@ Install and configure components
         auth_url = http://controller:35357
         memcached_servers = controller:11211
         auth_type = password
-         project_domain_name = default
-         user_domain_name = default
+         project_domain_id = default
+         user_domain_id = default
         project_name = service
         username = cinder
         password = CINDER_PASS
--- a/doc/source/install/cinder-controller-install-ubuntu.rst
+++ b/doc/source/install/cinder-controller-install-ubuntu.rst
@ -281,8 +281,8 @@ Install and configure components
         auth_url = http://controller:35357
         memcached_servers = controller:11211
         auth_type = password
-         project_domain_name = default
-         user_domain_name = default
+         project_domain_id = default
+         user_domain_id = default
         project_name = service
         username = cinder
         password = CINDER_PASS
--- a/doc/source/install/cinder-storage-install-obs.rst
+++ b/doc/source/install/cinder-storage-install-obs.rst
@ -162,8 +162,8 @@ Install and configure components
        auth_url = http://controller:35357
        memcached_servers = controller:11211
        auth_type = password
-        project_domain_name = default
-        user_domain_name = default
+        project_domain_id = default
+        user_domain_id = default
        project_name = service
        username = cinder
        password = CINDER_PASS
--- a/doc/source/install/cinder-storage-install-rdo.rst
+++ b/doc/source/install/cinder-storage-install-rdo.rst
@ -171,8 +171,8 @@ Install and configure components
        auth_url = http://controller:35357
        memcached_servers = controller:11211
        auth_type = password
-        project_domain_name = default
-        user_domain_name = default
+        project_domain_id = default
+        user_domain_id = default
        project_name = service
        username = cinder
        password = CINDER_PASS
--- a/doc/source/install/cinder-storage-install-ubuntu.rst
+++ b/doc/source/install/cinder-storage-install-ubuntu.rst
@ -160,8 +160,8 @@ Install and configure components
        auth_url = http://controller:35357
        memcached_servers = controller:11211
        auth_type = password
-        project_domain_name = default
-        user_domain_name = default
+        project_domain_id = default
+        user_domain_id = default
        project_name = service
        username = cinder
        password = CINDER_PASS