diff options
| author |   Karthik S <ksundara@redhat.com> | 2017-08-17 08:14:21 -0400 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-09-02 15:54:33 +0000 |
| commit | 3d7cee4fc783c0dc8b600b6cf66541bfc2d8b726 (patch) | |
| tree | 78cfee904f9f704a968dd870f771a29e75dbb553 /puppet | |
| parent | 79bd4a5c576829470ee0605551cee89233732021 (diff) | |
NetworkDeploymentActions shall be made role specific
In case of an OSP upgrade, some of the roles may require
the reconfiguration of network via os-net-config, especially
with roles having DPDK nics. In order to facilitate this
configuration per role, the THT parameter
'NetworkDeploymentActions' is made role specific.
Change-Id: I17a1812cf9e1c60fb893bf36dc99ab3ec5fc7250
(cherry picked from commit 88711c3b800257f6b333157eb3dfc8f4e7003a46)
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/role.role.j2.yaml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index f58f7409..15da1773 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -105,6 +105,11 @@ parameters: description: DEPRECATED - use {{role.name}}IPs instead type: json {%- endif %} + {{role.name}}NetworkDeploymentActions: + type: comma_delimited_list + description: > + Heat action when to apply network configuration changes + default: [] NetworkDeploymentActions: type: comma_delimited_list description: > @@ -265,6 +270,11 @@ conditions: - {get_param: {{role.deprecated_param_flavor}}} - {{default_flavor_name}} {%- endif %} + role_network_deployment_actions_exists: + not: + equals: + - {get_param: {{role.name}}NetworkDeploymentActions} + - [] resources: {{server_resource_name}}: @@ -490,7 +500,10 @@ resources: actions: if: - server_not_blacklisted - - {get_param: NetworkDeploymentActions} + - if: + - role_network_deployment_actions_exists + - {get_param: {{role.name}}NetworkDeploymentActions} + - {get_param: NetworkDeploymentActions} - [] {{server_resource_name}}UpgradeInitConfig: |