diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-12-22 23:41:08 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-12-22 23:41:08 +0000 |
commit | 2a6df57475642792264e3e069359167ee6a81b0a (patch) | |
tree | 24053f028a36c72c90416d96fa2e6acb8dc5ec2d /puppet/controller-role.yaml | |
parent | 6190f56a511fae5a0e7db956f885afe935a6b68e (diff) | |
parent | d5cd18d3c5e1a54cb15be39e421f98fd01e1a99c (diff) |
Merge "Introduce role-specific NodeUserData, use for docker"
Diffstat (limited to 'puppet/controller-role.yaml')
-rw-r--r-- | puppet/controller-role.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index 221bfed7..05527b63 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -191,6 +191,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 @@ -202,6 +204,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::Controller::NodeUserData + ExternalPort: type: OS::TripleO::Controller::Ports::ExternalPort properties: |