diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-02-25 00:13:27 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-02-25 00:13:27 +0000 |
commit | 656cf974e311b52843e1a142fa1bb5fb48ed02e0 (patch) | |
tree | 09477944f7e92f24ff8df7c074f2f90cb668d5b1 /puppet/services/nova-conductor.yaml | |
parent | a41c5ebcc23ffc1df2f3baa6dcc173e8ad6143bf (diff) | |
parent | 577ea9b01fb62c7f59f7e47b1f9959c52163ce08 (diff) |
Merge "Upgrade nova-api/scheduler/conductor packages at step3 not step2." into stable/ocata
Diffstat (limited to 'puppet/services/nova-conductor.yaml')
-rw-r--r-- | puppet/services/nova-conductor.yaml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml index 7b086536..a19d0f8d 100644 --- a/puppet/services/nova-conductor.yaml +++ b/puppet/services/nova-conductor.yaml @@ -69,13 +69,10 @@ outputs: - name: Stop nova_conductor service tags: step2 service: name=openstack-nova-conductor state=stopped - - name: update nova conductor - tags: step2 - yum: name=openstack-nova-conductor state=latest # If not already set by puppet (e.g a pre-ocata version), set the # upgrade_level for compute to "auto" - name: Set compute upgrade level to auto - tags: step3 + tags: step2 ini_file: str_replace: template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL" |