aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/role.role.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-22 23:41:08 +0000
committerGerrit Code Review <review@openstack.org>2016-12-22 23:41:08 +0000
commit2a6df57475642792264e3e069359167ee6a81b0a (patch)
tree24053f028a36c72c90416d96fa2e6acb8dc5ec2d /puppet/role.role.j2.yaml
parent6190f56a511fae5a0e7db956f885afe935a6b68e (diff)
parentd5cd18d3c5e1a54cb15be39e421f98fd01e1a99c (diff)
Merge "Introduce role-specific NodeUserData, use for docker"
Diffstat (limited to 'puppet/role.role.j2.yaml')
-rw-r--r--puppet/role.role.j2.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 7b3d2d3..22370a7 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -175,6 +175,8 @@ resources:
type: multipart
- config: {get_resource: NodeUserData}
type: multipart
+ - config: {get_resource: RoleUserData}
+ type: multipart
# Creates the "heat-admin" user if configured via the environment
# Should return a OS::Heat::MultipartMime reference via OS::stack_id
@@ -186,6 +188,11 @@ resources:
NodeUserData:
type: OS::TripleO::NodeUserData
+ # For optional operator role-specific userdata
+ # Should return a OS::Heat::MultipartMime reference via OS::stack_id
+ RoleUserData:
+ type: OS::TripleO::{{role}}::NodeUserData
+
ExternalPort:
type: OS::TripleO::{{role}}::Ports::ExternalPort
properties: