diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-24 21:19:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-24 21:19:36 +0000 |
| commit | 0ea39999dc8b7789815a295ca4dbc3b37036a805 (patch) | |
| tree | 498756b9e47b337dba1c1506a090e9a89c9465e8 | |
| parent | ac9087794f6d57fa1e14f16f14b104983abf93fb (diff) | |
| parent | 5593877817b332bd7a650f051cff5f5988ab1e54 (diff) | |
Merge "Upgrade nova-api/scheduler/conductor packages at step3 not step2."
| -rw-r--r-- | puppet/services/README.rst | 4 | ||||
| -rw-r--r-- | puppet/services/nova-api.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/nova-conductor.yaml | 5 | ||||
| -rw-r--r-- | puppet/services/nova-scheduler.yaml | 3 |
4 files changed, 4 insertions, 11 deletions
diff --git a/puppet/services/README.rst b/puppet/services/README.rst index e5c11535..223c3ed0 100644 --- a/puppet/services/README.rst +++ b/puppet/services/README.rst @@ -104,7 +104,9 @@ step, "step2" for the second, etc. 2) Stop all control-plane services, ready for upgrade - 3) Perform a package update, (either specific packages or the whole system) + 3) Perform a package update and install new packages: A general + upgrade is done, and only new package should go into service + ansible tasks. 4) Start services needed for migration tasks (e.g DB) diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index 0adefecd..f27b53f2 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -197,9 +197,6 @@ outputs: - name: Stop and disable nova_api service (pre-upgrade not under httpd) tags: step2 service: name=openstack-nova-api state=stopped enabled=no - - name: update nova api - tags: step2 - yum: name=openstack-nova-api state=latest - name: Create puppet manifest to set transport_url in nova.conf tags: step5 when: is_bootstrap_node 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" diff --git a/puppet/services/nova-scheduler.yaml b/puppet/services/nova-scheduler.yaml index 0e0b9d1e..e08bf182 100644 --- a/puppet/services/nova-scheduler.yaml +++ b/puppet/services/nova-scheduler.yaml @@ -67,6 +67,3 @@ outputs: - name: Stop nova_scheduler service tags: step2 service: name=openstack-nova-scheduler state=stopped - - name: update nova scheduler - tags: step2 - yum: name=openstack-nova-scheduler state=latest |