aboutsummaryrefslogtreecommitdiffstats
path: root/hosts-config.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-11-21 08:43:01 -0500
committerDan Prince <dprince@redhat.com>2016-11-30 14:22:36 -0500
commitf02742a981a602b439c918236bdb771bbf13dc97 (patch)
tree368215eaaa0854dca5fe2f4ad7b1c64edc98dc77 /hosts-config.yaml
parent6df32707e9698da5a647aff2b20e6fc2617ea1d2 (diff)
Configure /etc/hosts via os-collect-config script
This patch moves the t-i-e element code for hosts configuration into a t-h-t shell script that gets driven by a os-collect-config script hook. This helps accomplish several goals: - moves us away from t-i-e - gives us better signal handling in the error case (where the previous element relied on 99-refresh-completed - Allows the t-h-t undercloud installer to more easily consume this since it doesn't rely on the old os-apply-config metadata (which that installer doesn't support). Change-Id: I73c3d4818ef531a3559fab272521f44519e2f486
Diffstat (limited to 'hosts-config.yaml')
-rw-r--r--hosts-config.yaml18
1 files changed, 14 insertions, 4 deletions
diff --git a/hosts-config.yaml b/hosts-config.yaml
index b5a22b7f..a24b9bb4 100644
--- a/hosts-config.yaml
+++ b/hosts-config.yaml
@@ -8,11 +8,18 @@ parameters:
resources:
hostsConfigImpl:
- type: OS::Heat::StructuredConfig
+ type: OS::Heat::SoftwareConfig
properties:
- group: os-apply-config
- config:
- hosts: {get_param: hosts}
+ group: script
+ inputs:
+ - name: hosts
+ default:
+ list_join:
+ - ' '
+ - str_split:
+ - '\n'
+ - {get_param: hosts}
+ config: {get_file: scripts/hosts-config.sh}
outputs:
config_id:
@@ -25,3 +32,6 @@ outputs:
hostname-based access to the deployed nodes (useful for testing without
setting up a DNS).
value: {get_attr: [hostsConfigImpl, config, hosts]}
+ OS::stack_id:
+ description: The ID of the hostsConfigImpl resource.
+ value: {get_resource: hostsConfigImpl}