From 4e3c36139a070f3a2c1c7266c57aed7bb424709a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 12 Jul 2019 10:16:27 +0900
Subject: [PATCH] Enable service token in nova and cinder

This patch enables service token feature in nova and cinder, which
can be used to avoid problems in inter-component request caused by
token expiration for long running tasks.

Depends-on: https://review.opendev.org/#/c/666467/
Depends-on: https://review.opendev.org/#/c/666471/
Depends-on: https://review.opendev.org/#/c/666746/
Change-Id: Ia9cab3080a6e0ef7433fa0be19b98f8e63bae587
---
 manifests/profile/base/cinder.pp | 1 +
 manifests/profile/base/nova.pp   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index 56eee0959..e6e598e09 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -128,6 +128,7 @@ class tripleo::profile::base::cinder (
     include ::cinder::glance
     include ::cinder::nova
     include ::cinder::logging
+    include ::cinder::keystone::service_user
   }
 
   if $step >= 5 {
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index fb21981e2..ab3bab16f 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -148,5 +148,6 @@ class tripleo::profile::base::nova (
       }),
     }
     include ::nova::placement
+    include ::nova::keystone::service_user
   }
 }