summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-14 02:18:56 +0000
committerGerrit Code Review <review@openstack.org>2016-10-14 02:18:56 +0000
commitceb30c9946761ad64890e0b13c453e7a5bc6201e (patch)
tree12f1b27b8632d7ff308bf6cc6846d99c13dc872d /puppet
parenta1b7af553de02e79f47af4110955e5fc73c385f3 (diff)
parent9f8944111c280de877326471899be23caca9bb94 (diff)
Merge "Split out hosts config deployment"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/all-nodes-config.yaml12
1 files changed, 0 insertions, 12 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index d64f70db..cc5e4eac 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -12,8 +12,6 @@ parameters:
type: string
cloud_name_ctlplane:
type: string
- hosts:
- type: comma_delimited_list
# FIXME(shardy) this can be comma_delimited_list when
# https://bugs.launchpad.net/heat/+bug/1617019 is fixed
enabled_services:
@@ -75,10 +73,6 @@ resources:
properties:
group: os-apply-config
config:
- hosts:
- list_join:
- - "\n"
- - {get_param: hosts}
hiera:
datafiles:
bootstrap_node:
@@ -217,9 +211,3 @@ outputs:
description: The ID of the allNodesConfigImpl resource.
value:
{get_resource: allNodesConfigImpl}
- hosts_entries:
- description: |
- The content that should be appended to your /etc/hosts if you want to get
- hostname-based access to the deployed nodes (useful for testing without
- setting up a DNS).
- value: {get_attr: [allNodesConfigImpl, config, hosts]}