aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-10-10 01:11:32 +0000
committerGerrit Code Review <review@openstack.org>2017-10-10 01:11:32 +0000
commite2d302cbacaec70588a2e7d4e42462832c072ed7 (patch)
treebf339060413a3d21723fc08c1f700c487627c345
parentc4bd0a3468af429abfbbcea634ee1023f95778c9 (diff)
parentd76998fcbb43684f1464b1feabfe0fc1f5ac7569 (diff)
Merge "Special treatment for os-net-config upgrade." into stable/pike
-rw-r--r--puppet/services/tripleo-packages.yaml9
1 files changed, 9 insertions, 0 deletions
diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml
index 2a8620c..0dbdbf8 100644
--- a/puppet/services/tripleo-packages.yaml
+++ b/puppet/services/tripleo-packages.yaml
@@ -53,6 +53,15 @@ outputs:
fail: msg="rpm-python package was not present before this run! Check environment before re-running"
when: rpm_python_check.changed != false
tags: step0
+ - block:
+ - name: Upgrade os-net-config
+ yum: name=os-net-config state=latest
+ - name: take new os-net-config parameters into account now
+ command: os-net-config --no-activate -c /etc/os-net-config/config.json -v --detailed-exit-codes
+ register: os_net_config_upgrade
+ failed_when: os_net_config_upgrade.rc not in [0,2]
+ changed_when: os_net_config_upgrade.rc == 2
+ tags: step3
- name: Update all packages
tags: step3
yum: name=* state=latest