diff options
| author |   Steve Baker <sbaker@redhat.com> | 2016-12-08 14:44:35 +1300 |
|---|---|---|
| committer |   Flavio Percoco <flaper87@gmail.com> | 2016-12-19 18:13:57 +0100 |
| commit | d5cd18d3c5e1a54cb15be39e421f98fd01e1a99c (patch) | |
| tree | 1dca58f2f35c0ccfc7c6cf04e0d3f060b7f82d32 /puppet/objectstorage-role.yaml | |
| parent | e6bc52058174d4dd5e35f075f20c58c164206d98 (diff) | |
Introduce role-specific NodeUserData, use for docker
Currently when the docker environments are invoked, every node has the
boot script run which replaces os-collect-config with the heat-agents
container. This should only be happening on Compute nodes currently,
and each role will be converted to heat-agents one at a time.
This change implements a role-specific NodeUserData resource and uses
that mechanism to run docker/firstboot/install_docker_agents.yaml only
on Compute nodes.
Change-Id: Id81811dbcaf0e661c3980aa25f3ca80db5ef0954
Diffstat (limited to 'puppet/objectstorage-role.yaml')
| -rw-r--r-- | puppet/objectstorage-role.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml index 49b2704d..61be37f4 100644 --- a/puppet/objectstorage-role.yaml +++ b/puppet/objectstorage-role.yaml @@ -142,6 +142,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 @@ -153,6 +155,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::ObjectStorage::NodeUserData + ExternalPort: type: OS::TripleO::SwiftStorage::Ports::ExternalPort properties: |