diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-01 16:46:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-01 16:46:17 +0000 |
| commit | 30ace83b10423feaecedc081fa0a27a90125b997 (patch) | |
| tree | e07eb60c4de69288ea3c67c4a2b4be34898b2af3 /puppet | |
| parent | e85422bd849613f20bffefd59ebb3dc29407382b (diff) | |
| parent | 4b5b24462b7c37bd784502d8afa341181a9fab9a (diff) | |
Merge "Add local template generation tox task"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/role.role.j2.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index c2c322d8..27dfc49f 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -5,13 +5,17 @@ parameters: description: Flavor for the {{role}} node. default: baremetal type: string +{% if disable_constraints is not defined %} constraints: - custom_constraint: nova.flavor +{% endif %} {{role}}Image: type: string default: overcloud-full +{% if disable_constraints is not defined %} constraints: - custom_constraint: glance.image +{% endif %} ImageUpdatePolicy: default: 'REBUILD_PRESERVE_EPHEMERAL' description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt. @@ -20,8 +24,10 @@ parameters: description: Name of an existing Nova key pair to enable SSH access to the instances type: string default: default +{% if disable_constraints is not defined %} constraints: - custom_constraint: nova.keypair +{% endif %} ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set |