aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-25 20:01:25 +0000
committerGerrit Code Review <review@openstack.org>2017-03-25 20:01:25 +0000
commit6df622239c02a2b9e76a540fb8c9d9f97e451fbe (patch)
treebb0f6d4b6a6666986795aa42714dbf4d6e6c9d79
parent36b99ad81a2ff29cf2c083d6c62bc99a509fab09 (diff)
parent1c1565057567d2732a38dfe400195b853601f5f1 (diff)
Merge "Explicitly configure credentials used by ironic to access other services" into stable/ocata
-rw-r--r--manifests/profile/base/ironic/conductor.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp
index 4824648..7f90da9 100644
--- a/manifests/profile/base/ironic/conductor.pp
+++ b/manifests/profile/base/ironic/conductor.pp
@@ -44,5 +44,12 @@ class tripleo::profile::base::ironic::conductor (
include ::ironic::drivers::ilo
include ::ironic::drivers::ipmi
include ::ironic::drivers::ssh
+
+ # Configure access to other services
+ include ::ironic::drivers::inspector
+ include ::ironic::glance
+ include ::ironic::neutron
+ include ::ironic::service_catalog
+ include ::ironic::swift
}
}