aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.j2.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-10-10 21:03:12 -0400
committerDan Prince <dprince@redhat.com>2016-10-13 14:15:54 -0400
commit9f8944111c280de877326471899be23caca9bb94 (patch)
tree9163ed71503d46ba125a3f8f353f9cb7144f4bb2 /overcloud-resource-registry-puppet.j2.yaml
parent8f5ebd08c4816849f959ea8471ebe956b1e1f601 (diff)
Split out hosts config deployment
This patch moves the hosts configuration into its own deployment. It will continue to use os-apply-config as something that is required early on in the bootstrapping (it needs to be configured before puppet runs for example). The motivation here is so we can refactor all-nodes-config.yaml to use a new hiera hook that that avoids os-apply-config entirely. Change-Id: Ib3e4380f205358b27d22a1102b663cf300b1ed86 Partial-bug: #1596373
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index c7f15105..1fb28128 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -3,6 +3,7 @@ resource_registry:
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
OS::TripleO::PostDeploySteps: puppet/post.yaml
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
+ OS::TripleO::Hosts::SoftwareConfig: hosts-config.yaml
OS::TripleO::DefaultPasswords: default_passwords.yaml
# Tasks (for internal TripleO usage)