diff --git a/doc/source/install-guide-from-source.rst b/doc/source/install-guide-from-source.rst
index b0dbc94cc9..241a3613f7 100644
--- a/doc/source/install-guide-from-source.rst
+++ b/doc/source/install-guide-from-source.rst
@@ -225,7 +225,8 @@ service, you must create a database, service credentials, and API endpoints.
 
      .. code-block:: console
 
-        $ openstack role add --domain magnum --user magnum_domain_admin admin
+        $ openstack role add --domain magnum --user-domain magnum \
+          --user magnum_domain_admin admin
 
      .. note::
 
diff --git a/doc/source/troubleshooting-guide.rst b/doc/source/troubleshooting-guide.rst
index 318897eca6..fe19499e79 100644
--- a/doc/source/troubleshooting-guide.rst
+++ b/doc/source/troubleshooting-guide.rst
@@ -142,7 +142,7 @@ and the domain admin:
     openstack domain create magnum
     openstack user create trustee_domain_admin --password=secret \
         --domain=magnum
-    openstack role add --user=trustee_domain_admin --domain=magnum admin
+    openstack role add --user=trustee_domain_admin --user-domain magnum --domain=magnum admin
 
     source /opt/stack/devstack/functions
     export MAGNUM_CONF=/etc/magnum/magnum.conf
diff --git a/install-guide/source/common/prerequisites.rst b/install-guide/source/common/prerequisites.rst
index 484c47fb08..f9bd315acf 100644
--- a/install-guide/source/common/prerequisites.rst
+++ b/install-guide/source/common/prerequisites.rst
@@ -180,7 +180,8 @@ service, you must create a database, service credentials, and API endpoints.
 
      .. code-block:: console
 
-        $ openstack role add --domain magnum --user magnum_domain_admin admin
+        $ openstack role add --domain magnum --user-domain magnum --user \
+          magnum_domain_admin admin
 
      .. note::