Updated from openstack-manuals

Change-Id: I581c7168571fb2ecc0e7b488d39c85b3a9b94eab

doc/glossary/glossary-terms.xml

@@ -3232,6 +3232,18 @@
       </glossdef>
     </glossentry>
 
+    <glossentry>
+      <glossterm>federated identity</glossterm>
+      <indexterm class="singular">
+        <primary>federated identity</primary>
+      </indexterm>
+
+      <glossdef>
+        <para>A method to establish trusts between identity providers and the
+          OpenStack cloud.</para>
+        </glossdef>
+    </glossentry>
+
     <glossentry>
       <glossterm>Fedora</glossterm>
       <indexterm class="singular">
@@ -4036,6 +4048,20 @@
       </glossdef>
     </glossentry>
 
+    <glossentry>
+      <glossterm>identity provider</glossterm>
+      <indexterm class="singular">
+        <primary>identity provider</primary>
+        <secondary>basics of</secondary>
+      </indexterm>
+
+      <glossdef>
+        <para>A directory service, which allows users to login with a user
+          name and password. It is a typical source of authentication
+          tokens.</para>
+      </glossdef>
+    </glossentry>
+
     <glossentry>
       <glossterm>Identity Service</glossterm>
       <indexterm class="singular">
@@ -7233,6 +7259,18 @@
       </glossdef>
     </glossentry>
 
+    <glossentry>
+      <glossterm>SAML assertion</glossterm>
+      <indexterm class="singular">
+        <primary>SAML assertion</primary>
+      </indexterm>
+
+      <glossdef>
+        <para>Contains information about a user as provided by the identity
+          provider. It is an indication that a user has been authenticated.</para>
+      </glossdef>
+    </glossentry>
+
     <glossentry>
       <glossterm>scheduler manager</glossterm>
       <indexterm class="singular">
@@ -7418,6 +7456,19 @@
       </glossdef>
     </glossentry>
 
+    <glossentry>
+      <glossterm>service provider</glossterm>
+      <indexterm class="singular">
+        <primary>service provider</primary>
+      </indexterm>
+
+      <glossdef>
+        <para>A system that provides services to other system entities. In
+          case of federated identity, OpenStack Identity is the service
+          provider.</para>
+      </glossdef>
+    </glossentry>
+
     <glossentry>
       <glossterm>service registration</glossterm>
       <indexterm class="singular">