summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/keystone.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-23 19:28:39 +0000
committerGerrit Code Review <review@openstack.org>2017-01-23 19:28:39 +0000
commit5b2913183cbb9c3d6c991c2c027abe540e4ba4f0 (patch)
tree1bd33b28f8095ffa9bb1cde3f2f147f142c5d44c /manifests/profile/base/keystone.pp
parent9192439f41aafecf740bfa5ce65afd45135c0b10 (diff)
parent0b32f609ad1c85c919b6bcc8497b1c4672660925 (diff)
Merge "Implement Nova ec2api profile"
Diffstat (limited to 'manifests/profile/base/keystone.pp')
-rw-r--r--manifests/profile/base/keystone.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index a388def..a3a39e9 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -255,6 +255,8 @@ class tripleo::profile::base::keystone (
include ::zaqar::keystone::auth
include ::zaqar::keystone::auth_websocket
}
+ if hiera('ec2_api_enabled', false) {
+ include ::ec2api::keystone::auth
+ }
}
}
-