From 8f7356dca6bda1349be1ce265b58ab8a67ce6d3b Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 29 Nov 2017 11:32:28 +0800
Subject: [PATCH] Fix project_domain_name and user_domain_name in doc
Change-Id: I192708586d89d1bf07a5e52ed1c45de6eab689a5
Closes-Bug: #1735051
---
doc/source/install/cinder-controller-install-obs.rst | 4 ++--
doc/source/install/cinder-controller-install-rdo.rst | 4 ++--
doc/source/install/cinder-controller-install-ubuntu.rst | 4 ++--
doc/source/install/cinder-storage-install-obs.rst | 4 ++--
doc/source/install/cinder-storage-install-rdo.rst | 4 ++--
doc/source/install/cinder-storage-install-ubuntu.rst | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/doc/source/install/cinder-controller-install-obs.rst b/doc/source/install/cinder-controller-install-obs.rst
index 40bd81d14c8..0b7dee27aa0 100644
--- 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
diff --git a/doc/source/install/cinder-controller-install-rdo.rst b/doc/source/install/cinder-controller-install-rdo.rst
index 27997b7e221..b1a1b804cb0 100644
--- 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
diff --git a/doc/source/install/cinder-controller-install-ubuntu.rst b/doc/source/install/cinder-controller-install-ubuntu.rst
index b6ed33af053..be34d71a0e8 100644
--- 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
diff --git a/doc/source/install/cinder-storage-install-obs.rst b/doc/source/install/cinder-storage-install-obs.rst
index 9d99c61c2fd..967146c823c 100644
--- 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
diff --git a/doc/source/install/cinder-storage-install-rdo.rst b/doc/source/install/cinder-storage-install-rdo.rst
index 65b5ee92763..59446b68693 100644
--- 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
diff --git a/doc/source/install/cinder-storage-install-ubuntu.rst b/doc/source/install/cinder-storage-install-ubuntu.rst
index e0997784203..08ee3e23927 100644
--- 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