Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Composable OpenContrail compute plugin"
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
ringbuilder.pp
diff --git
a/puppet/manifests/ringbuilder.pp
b/puppet/manifests/ringbuilder.pp
index
a623da2
..
2411ff8
100644
(file)
--- a/
puppet/manifests/ringbuilder.pp
+++ b/
puppet/manifests/ringbuilder.pp
@@
-89,6
+89,11
@@
class tripleo::ringbuilder (
}
}
}
}
+if hiera('step') >= 2 {
+ # pre-install swift here so we can build rings
+ include ::swift
+}
+
if hiera('step') >= 3 {
include ::tripleo::ringbuilder
}
if hiera('step') >= 3 {
include ::tripleo::ringbuilder
}