Browse Source

Merge "Update ffwd-upgrade branch names" into stable/train

changes/23/705923/1
Zuul Gerrit Code Review 3 weeks ago
parent
commit
78f6b58547
53 changed files with 117 additions and 117 deletions
  1. +1
    -1
      common/deploy-steps.j2
  2. +2
    -2
      deployment/aodh/aodh-api-container-puppet.yaml
  3. +2
    -2
      deployment/aodh/aodh-evaluator-container-puppet.yaml
  4. +2
    -2
      deployment/aodh/aodh-listener-container-puppet.yaml
  5. +2
    -2
      deployment/aodh/aodh-notifier-container-puppet.yaml
  6. +2
    -2
      deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
  7. +2
    -2
      deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
  8. +2
    -2
      deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
  9. +2
    -2
      deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
  10. +4
    -4
      deployment/cinder/cinder-api-container-puppet.yaml
  11. +2
    -2
      deployment/cinder/cinder-backup-pacemaker-puppet.yaml
  12. +2
    -2
      deployment/cinder/cinder-scheduler-container-puppet.yaml
  13. +2
    -2
      deployment/cinder/cinder-volume-container-puppet.yaml
  14. +2
    -2
      deployment/cinder/cinder-volume-pacemaker-puppet.yaml
  15. +1
    -1
      deployment/database/mysql-container-puppet.yaml
  16. +1
    -1
      deployment/database/mysql-pacemaker-puppet.yaml
  17. +2
    -2
      deployment/database/redis-pacemaker-puppet.yaml
  18. +2
    -2
      deployment/glance/glance-api-container-puppet.yaml
  19. +3
    -3
      deployment/gnocchi/gnocchi-api-container-puppet.yaml
  20. +2
    -2
      deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
  21. +3
    -3
      deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
  22. +2
    -2
      deployment/heat/heat-api-cfn-container-puppet.yaml
  23. +3
    -3
      deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
  24. +2
    -2
      deployment/heat/heat-api-container-puppet.yaml
  25. +2
    -2
      deployment/heat/heat-engine-container-puppet.yaml
  26. +3
    -3
      deployment/ironic/ironic-api-container-puppet.yaml
  27. +2
    -2
      deployment/ironic/ironic-conductor-container-puppet.yaml
  28. +2
    -2
      deployment/keystone/keystone-container-puppet.yaml
  29. +3
    -3
      deployment/manila/manila-api-container-puppet.yaml
  30. +3
    -3
      deployment/manila/manila-scheduler-container-puppet.yaml
  31. +3
    -3
      deployment/manila/manila-share-container-puppet.yaml
  32. +3
    -3
      deployment/manila/manila-share-pacemaker-puppet.yaml
  33. +2
    -2
      deployment/memcached/memcached-container-puppet.yaml
  34. +2
    -2
      deployment/metrics/collectd-container-puppet.yaml
  35. +2
    -2
      deployment/neutron/neutron-api-container-puppet.yaml
  36. +2
    -2
      deployment/neutron/neutron-dhcp-container-puppet.yaml
  37. +2
    -2
      deployment/neutron/neutron-l3-container-puppet.yaml
  38. +2
    -2
      deployment/neutron/neutron-metadata-container-puppet.yaml
  39. +2
    -2
      deployment/neutron/neutron-ovs-agent-container-puppet.yaml
  40. +5
    -5
      deployment/nova/nova-api-container-puppet.yaml
  41. +2
    -2
      deployment/nova/nova-compute-container-puppet.yaml
  42. +2
    -2
      deployment/nova/nova-conductor-container-puppet.yaml
  43. +3
    -3
      deployment/nova/nova-ironic-container-puppet.yaml
  44. +2
    -2
      deployment/nova/nova-scheduler-container-puppet.yaml
  45. +2
    -2
      deployment/nova/nova-vnc-proxy-container-puppet.yaml
  46. +2
    -2
      deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
  47. +2
    -2
      deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
  48. +2
    -2
      deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
  49. +2
    -2
      deployment/sahara/sahara-api-container-puppet.yaml
  50. +2
    -2
      deployment/sahara/sahara-engine-container-puppet.yaml
  51. +2
    -2
      deployment/swift/swift-proxy-container-puppet.yaml
  52. +2
    -2
      deployment/swift/swift-storage-container-puppet.yaml
  53. +2
    -2
      deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

+ 1
- 1
common/deploy-steps.j2 View File

@@ -90,7 +90,7 @@ parameters:
description: Whether containerized puppet executions use modules from the baremetal host. Defaults to true. Can be set to false to consume puppet modules from containers directly.
FastForwardUpgradeReleases:
type: comma_delimited_list
default: ['ocata', 'pike', 'queens']
default: ['rocky', 'stein', 'train']
description: List of releases to fast forward through during upgrade. Last release in list is used for post steps.
ContainerLogStdoutPath:
type: string


+ 2
- 2
deployment/aodh/aodh-api-container-puppet.yaml View File

@@ -251,7 +251,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check for aodh running under apache
tags: common
@@ -276,7 +276,7 @@ outputs:
service: name=httpd state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- aodh_httpd_enabled|bool
- httpd_running|bool
- name: Aodh package update


+ 2
- 2
deployment/aodh/aodh-evaluator-container-puppet.yaml View File

@@ -141,7 +141,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-aodh-evaluator is deployed
command: systemctl is-enabled --quiet openstack-aodh-evaluator
@@ -154,5 +154,5 @@ outputs:
service: name=openstack-aodh-evaluator state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- aodh_evaluator_enabled|bool

+ 2
- 2
deployment/aodh/aodh-listener-container-puppet.yaml View File

@@ -141,7 +141,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-aodh-listener is deployed
command: systemctl is-enabled --quiet openstack-aodh-listener
@@ -154,5 +154,5 @@ outputs:
service: name=openstack-aodh-listener state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- aodh_listener_enabled|bool

+ 2
- 2
deployment/aodh/aodh-notifier-container-puppet.yaml View File

@@ -141,7 +141,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-aodh-notifier is deployed
command: systemctl is-enabled --quiet openstack-aodh-notifier
@@ -154,5 +154,5 @@ outputs:
service: name=openstack-aodh-notifier state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- aodh_notifier_enabled|bool

+ 2
- 2
deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml View File

@@ -188,7 +188,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-ceilometer-central is deployed
command: systemctl is-enabled --quiet openstack-ceilometer-central
@@ -201,5 +201,5 @@ outputs:
service: name=openstack-ceilometer-central state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- ceilometer_agent_central_enabled|bool

+ 2
- 2
deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml View File

@@ -136,7 +136,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-ceilometer-compute is deployed
command: systemctl is-enabled openstack-ceilometer-compute
@@ -148,6 +148,6 @@ outputs:
- name: FFU stop and disable openstack-ceilometer-compute service
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- ceilometer_agent_compute_enabled|bool
service: name=openstack-ceilometer-compute state=stopped enabled=no

+ 2
- 2
deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml View File

@@ -149,7 +149,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-ceilometer-ipmi is enabled
command: systemctl is-enabled openstack-ceilometer-ipmi
@@ -161,6 +161,6 @@ outputs:
- name: FFU stop and disable openstack-ceilometer-ipmi service
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- ceilometer_ipmi_enabled|bool
service: name=openstack-ceilometer-ipmi state=stopped enabled=no

+ 2
- 2
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml View File

@@ -175,7 +175,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-ceilometer-notification is deployed
command: systemctl is-enabled openstack-ceilometer-notification
@@ -187,6 +187,6 @@ outputs:
- name: FFU stop and diable openstack-ceilometer-notification service
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- ceilometer_agent_notification_enabled|bool
service: name=openstack-ceilometer-notification state=stopped enabled=no

+ 4
- 4
deployment/cinder/cinder-api-container-puppet.yaml View File

@@ -378,7 +378,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check is cinder_api is deployed
command: systemctl is-enabled --quiet openstack-cinder-api
@@ -391,7 +391,7 @@ outputs:
service: name=openstack-cinder-api state=stopped
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- cinder_api_enabled|bool
- name: Extra removal of services for cinder
shell: |
@@ -401,13 +401,13 @@ outputs:
while read i ; do cinder-manage service remove $i ; done
when:
- step|int == 5
- release == 'pike'
- release == 'stein'
- is_bootstrap_node|bool
- name: Extra migration for cinder
command: cinder-manage db online_data_migrations
when:
- step|int == 5
- release == 'pike'
- release == 'stein'
- is_bootstrap_node|bool
- name: Cinder package update
package:


+ 2
- 2
deployment/cinder/cinder-backup-pacemaker-puppet.yaml View File

@@ -409,7 +409,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
block:
- name: Check cluster resource status
@@ -432,6 +432,6 @@ outputs:
until: cinder_backup_output.rc == 0
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
- cinder_backup_res|bool

+ 2
- 2
deployment/cinder/cinder-scheduler-container-puppet.yaml View File

@@ -167,7 +167,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if cinder_scheduler is deployed
command: systemctl is-enabled --quiet openstack-cinder-scheduler
@@ -180,5 +180,5 @@ outputs:
service: name=openstack-cinder-scheduler state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- cinder_scheduler_enabled|bool

+ 2
- 2
deployment/cinder/cinder-volume-container-puppet.yaml View File

@@ -336,7 +336,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if cinder_volume is deployed
command: systemctl is-enabled --quiet openstack-cinder-volume
@@ -349,5 +349,5 @@ outputs:
service: name=openstack-cinder-volume state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- cinder_volume_enabled|bool

+ 2
- 2
deployment/cinder/cinder-volume-pacemaker-puppet.yaml View File

@@ -402,7 +402,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
block:
- name: Check cluster resource status
@@ -425,6 +425,6 @@ outputs:
until: cinder_volume_output.rc == 0
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
- cinder_volume_res|bool

+ 1
- 1
deployment/database/mysql-container-puppet.yaml View File

@@ -321,7 +321,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 6
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
block:
- name: Remove whitespaces in .my.cnf


+ 1
- 1
deployment/database/mysql-pacemaker-puppet.yaml View File

@@ -631,7 +631,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 6
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
block:
- name: Remove whitespaces in .my.cnf


+ 2
- 2
deployment/database/redis-pacemaker-puppet.yaml View File

@@ -478,7 +478,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
block:
- name: Check cluster resource status of redis
@@ -501,6 +501,6 @@ outputs:
until: redis_output.rc == 0
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
- redis_res|bool

+ 2
- 2
deployment/glance/glance-api-container-puppet.yaml View File

@@ -615,7 +615,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if glance_api is deployed
command: systemctl is-enabled --quiet openstack-glance-api
@@ -628,7 +628,7 @@ outputs:
service: name=openstack-glance-api state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- glance_api_enabled|bool
- name: glance package update
package: name=openstack-glance state=latest


+ 3
- 3
deployment/gnocchi/gnocchi-api-container-puppet.yaml View File

@@ -385,7 +385,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if httpd service is running
command: systemctl is-active --quiet httpd
@@ -419,12 +419,12 @@ outputs:
service: name=openstack-gnocchi-api state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- gnocchi_api_enabled|bool
- name: Stop and disable httpd service
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- gnocchi_httpd_enabled|bool
- httpd_running|bool
service: name=httpd state=stopped enabled=no


+ 2
- 2
deployment/gnocchi/gnocchi-metricd-container-puppet.yaml View File

@@ -196,7 +196,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-gnocchi-metricd is deployed
command: systemctl is-enabled --quiet openstack-gnocchi-metricd
@@ -209,5 +209,5 @@ outputs:
service: name=openstack-gnocchi-metricd state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- gnocchi_metricd_enabled|bool

+ 3
- 3
deployment/gnocchi/gnocchi-statsd-container-puppet.yaml View File

@@ -194,16 +194,16 @@ outputs:
register: gnocchi_statsd_enabled_result
when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- name: Set fact gnocchi_statsd_enabled
set_fact:
gnocchi_statsd_enabled: "{{ gnocchi_statsd_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- name: FFU stop and disable openstack-gnocchi-statsd service
service: name=openstack-gnocchi-statsd state=stopped enabled=no
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'
- gnocchi_statsd_enabled|bool

+ 2
- 2
deployment/heat/heat-api-cfn-container-puppet.yaml View File

@@ -232,7 +232,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-heat-api-cfn service is enabled
command: systemctl is-enabled openstack-heat-api-cfn
@@ -244,6 +244,6 @@ outputs:
- name: FFU stop and disable openstack-heat-api-cfn service
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- heat_api_cfn_enabled|bool
service: name=openstack-heat-api-cfn state=stopped enabled=no

+ 3
- 3
deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml View File

@@ -40,7 +40,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if heat_api_cloudwatch is deployed
command: systemctl is-enabled openstack-heat-api-cloudwatch
@@ -53,11 +53,11 @@ outputs:
service: name=openstack-heat-api-cloudwatch state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- heat_api_cloudwatch_enabled|bool
- name: Remove heat_api_cloudwatch package
package: name=openstack-heat-api-cloudwatch state=removed
ignore_errors: True
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'

+ 2
- 2
deployment/heat/heat-api-container-puppet.yaml View File

@@ -281,7 +281,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check openstack-heat-api is enabled
command: systemctl is-enabled openstack-heat-api
@@ -294,7 +294,7 @@ outputs:
service: name=openstack-heat-api state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- heat_api_enabled|bool
- name: FFU Heat package update
package:


+ 2
- 2
deployment/heat/heat-engine-container-puppet.yaml View File

@@ -291,7 +291,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-heat-engine is enabled
command: systemctl is-enabled --quiet openstack-heat-engine
@@ -303,6 +303,6 @@ outputs:
- name: FFU stop and disable openstack-heat-engine service
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- heat_engine_enabled|bool
service: name=openstack-heat-engine state=stopped enabled=no

+ 3
- 3
deployment/ironic/ironic-api-container-puppet.yaml View File

@@ -291,7 +291,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if ironic_api is deployed
command: systemctl is-enabled --quiet openstack-ironic-api
@@ -304,7 +304,7 @@ outputs:
service: name=openstack-ironic-api state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- ironic_api_enabled|bool
- name: Ironic package update
package:
@@ -323,4 +323,4 @@ outputs:
when:
- step|int == 8
- is_bootstrap_node|bool
- release == 'pike'
- release == 'stein'

+ 2
- 2
deployment/ironic/ironic-conductor-container-puppet.yaml View File

@@ -595,7 +595,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if ironic_conductor is deployed
command: systemctl is-enabled --quiet openstack-ironic-conductor
@@ -608,7 +608,7 @@ outputs:
service: name=openstack-ironic-conductor state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- ironic_conductor_enabled|bool
- name: Ironic packages update
package:


+ 2
- 2
deployment/keystone/keystone-container-puppet.yaml View File

@@ -672,7 +672,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check for keystone running under apache
tags: common
@@ -697,7 +697,7 @@ outputs:
service: name=httpd state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- keystone_httpd_enabled|bool
- httpd_running|bool
- name: Keystone package update


+ 3
- 3
deployment/manila/manila-api-container-puppet.yaml View File

@@ -259,18 +259,18 @@ outputs:
register: manila_api_enabled_result
when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- name: Set fact manila_api_enabled
set_fact:
manila_api_enabled: "{{ manila_api_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- name: Stop openstack-manila-api
service: name=openstack-manila-api state=stopped
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- manila_api_enabled|bool
- name: manila package update
package:


+ 3
- 3
deployment/manila/manila-scheduler-container-puppet.yaml View File

@@ -131,16 +131,16 @@ outputs:
register: manila_scheduler_enabled_result
when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- name: Set fact manila_scheduler_enabled
set_fact:
manila_scheduler_enabled: "{{ manila_scheduler_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- name: Stop openstack-manila-scheduler
service: name=openstack-manila-scheduler state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- manila_scheduler_enabled|bool

+ 3
- 3
deployment/manila/manila-share-container-puppet.yaml View File

@@ -186,16 +186,16 @@ outputs:
register: manila_share_enabled_result
when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- name: Set fact manila_share_enabled
set_fact:
manila_share_enabled: "{{ manila_share_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- name: Stop openstack-manila-share
service: name=openstack-manila-share state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- manila_share_enabled|bool

+ 3
- 3
deployment/manila/manila-share-pacemaker-puppet.yaml View File

@@ -404,14 +404,14 @@ outputs:
register: manila_share_res_result
when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
- name: Set fact manila_share_res
set_fact:
manila_share_res: "{{ manila_share_res_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
- name: Disable the openstack-manila-share cluster resource
pacemaker_resource:
@@ -423,6 +423,6 @@ outputs:
until: manila_share_output.rc == 0
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
- manila_share_res|bool

+ 2
- 2
deployment/memcached/memcached-container-puppet.yaml View File

@@ -203,7 +203,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if memcached is deployed
command: systemctl is-enabled --quiet memcached
@@ -216,6 +216,6 @@ outputs:
- name: Stop and disable memcached service
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'
- memcached_enabled|bool
service: name=memcached state=stopped enabled=no

+ 2
- 2
deployment/metrics/collectd-container-puppet.yaml View File

@@ -666,7 +666,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if collectd.service is deployed
command: systemctl is-enabled --quiet collectd.service
@@ -679,5 +679,5 @@ outputs:
service: name=collectd.service state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- collectd_enabled|bool

+ 2
- 2
deployment/neutron/neutron-api-container-puppet.yaml View File

@@ -528,7 +528,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if neutron_server is deployed
command: systemctl is-enabled --quiet neutron-server
@@ -541,7 +541,7 @@ outputs:
service: name=neutron-server state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- neutron_server_enabled|bool
- when:
- step|int == 6


+ 2
- 2
deployment/neutron/neutron-dhcp-container-puppet.yaml View File

@@ -432,7 +432,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if neutron_dhcp_agent is deployed
command: systemctl is-enabled --quiet neutron-dhcp-agent
@@ -445,7 +445,7 @@ outputs:
service: name=neutron-dhcp-agent state=stopped enabled=no
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'
- neutron_dhcp_agent_enabled|bool
post_upgrade_tasks:
- name: Check for neutron user


+ 2
- 2
deployment/neutron/neutron-l3-container-puppet.yaml View File

@@ -394,7 +394,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if neutron_l3_agent is deployed
command: systemctl is-enabled --quiet neutron-l3-agent
@@ -407,7 +407,7 @@ outputs:
service: name=neutron-l3-agent state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- neutron_l3_agent_enabled|bool
post_upgrade_tasks:
- name: Check for neutron user


+ 2
- 2
deployment/neutron/neutron-metadata-container-puppet.yaml View File

@@ -213,7 +213,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if neutron_metadata_agent is deployed
command: systemctl is-enabled --quiet neutron-metadata-agent
@@ -226,5 +226,5 @@ outputs:
service: name=neutron-metadata-agent state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- neutron_metadata_agent_enabled|bool

+ 2
- 2
deployment/neutron/neutron-ovs-agent-container-puppet.yaml View File

@@ -385,7 +385,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if neutron_ovs_agent is deployed
command: systemctl is-enabled --quiet neutron-openvswitch-agent
@@ -398,5 +398,5 @@ outputs:
service: name=neutron-openvswitch-agent state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- neutron_ovs_agent_enabled|bool

+ 5
- 5
deployment/nova/nova-api-container-puppet.yaml View File

@@ -508,7 +508,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if nova-api is deployed
command: systemctl is-enabled --quiet openstack-nova-api
@@ -522,12 +522,12 @@ outputs:
when:
- step|int == 1
- nova_api_enabled|bool
- release == 'ocata'
- release == 'rocky'
- name: Extra migration for nova tripleo/+bug/1656791
command: nova-manage db online_data_migrations
when:
- step|int == 5
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
- name: Update nova packages
package:
@@ -539,7 +539,7 @@ outputs:
#FIXME(lyarwood): Use puppet to do this?
- when:
- step|int == 7
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
block:
- name: Create puppet manifest to set transport_url in nova.conf
@@ -649,7 +649,7 @@ outputs:
async: {get_param: NovaDbSyncTimeout}
poll: 10
when:
- release == 'pike'
- release == 'stein'
- name: Sync nova_api DB
command: nova-manage api_db sync
- name: Online data migration for nova


+ 2
- 2
deployment/nova/nova-compute-container-puppet.yaml View File

@@ -1138,7 +1138,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if nova-compute is deployed
command: systemctl is-enabled --quiet openstack-nova-compute
@@ -1149,7 +1149,7 @@ outputs:
nova_compute_enabled: "{{ nova_compute_enabled_result.rc == 0 }}"
- when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
block:
- name: Stop and disable nova-compute service
service: name=openstack-nova-compute state=stopped


+ 2
- 2
deployment/nova/nova-conductor-container-puppet.yaml View File

@@ -237,7 +237,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if nova_conductor is deployed
command: systemctl is-enabled --quiet openstack-nova-conductor
@@ -250,5 +250,5 @@ outputs:
service: name=openstack-nova-conductor state=stopped
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- nova_conductor_enabled|bool

+ 3
- 3
deployment/nova/nova-ironic-container-puppet.yaml View File

@@ -240,7 +240,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if nova ironic is deployed
command: systemctl is-enabled --quiet openstack-nova-compute
@@ -253,11 +253,11 @@ outputs:
service: name=openstack-nova-compute state=stopped
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- nova_ironic_enabled|bool
- name: Set upgrade marker in nova statedir
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- nova_ironic_enabled|bool
file: path=/var/lib/nova/upgrade_marker state=touch owner=nova group=nova

+ 2
- 2
deployment/nova/nova-scheduler-container-puppet.yaml View File

@@ -220,7 +220,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if nova_scheduler is deployed
command: systemctl is-enabled --quiet openstack-nova-scheduler
@@ -233,7 +233,7 @@ outputs:
service: name=openstack-nova-scheduler state=stopped
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- nova_scheduler_enabled|bool
external_upgrade_tasks:
- when:


+ 2
- 2
deployment/nova/nova-vnc-proxy-container-puppet.yaml View File

@@ -309,7 +309,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if nova vncproxy is deployed
command: systemctl is-enabled --quiet openstack-nova-novncproxy
@@ -322,7 +322,7 @@ outputs:
service: name=openstack-nova-novncproxy state=stopped
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- nova_vncproxy_enabled|bool
external_upgrade_tasks:
- when:


+ 2
- 2
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml View File

@@ -452,7 +452,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
block:
- name: Check cluster resource status of rabbitmq
@@ -475,6 +475,6 @@ outputs:
until: rabbitmq_output.rc == 0
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
- rabbitmq_res|bool

+ 2
- 2
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml View File

@@ -439,7 +439,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
block:
- name: Check cluster resource status of rabbitmq
@@ -462,6 +462,6 @@ outputs:
until: rabbitmq_output.rc == 0
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
- rabbitmq_res|bool

+ 2
- 2
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml View File

@@ -458,7 +458,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
block:
- name: Check cluster resource status of rabbitmq
@@ -481,6 +481,6 @@ outputs:
until: rabbitmq_output.rc == 0
when:
- step|int == 2
- release == 'ocata'
- release == 'rocky'
- is_bootstrap_node|bool
- rabbitmq_res|bool

+ 2
- 2
deployment/sahara/sahara-api-container-puppet.yaml View File

@@ -211,7 +211,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check openstack-sahara-api is enabled
command: systemctl is-enabled openstack-sahara-api
@@ -224,7 +224,7 @@ outputs:
service: name=openstack-sahara-api state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- sahara_api_enabled|bool
- name: FFU Sahara package update
package:


+ 2
- 2
deployment/sahara/sahara-engine-container-puppet.yaml View File

@@ -145,7 +145,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: FFU check if openstack-sahara-engine is enabled
command: systemctl is-enabled --quiet openstack-sahara-engine
@@ -157,6 +157,6 @@ outputs:
- name: FFU stop and disable openstack-sahara-engine service
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- sahara_engine_enabled|bool
service: name=openstack-sahara-engine state=stopped enabled=no

+ 2
- 2
deployment/swift/swift-proxy-container-puppet.yaml View File

@@ -477,7 +477,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if swift-proxy or swift-object-expirer are deployed
command: systemctl is-enabled --quiet "{{ item }}"
@@ -494,5 +494,5 @@ outputs:
with_items: "{{ swift_proxy_services_enabled.results }}"
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- item.rc == 0

+ 2
- 2
deployment/swift/swift-storage-container-puppet.yaml View File

@@ -676,7 +676,7 @@ outputs:
fast_forward_upgrade_tasks:
- when:
- step|int == 0
- release == 'ocata'
- release == 'rocky'
block:
- name: Check if swift storage services are deployed
command: systemctl is-enabled --quiet "{{ item }}"
@@ -705,5 +705,5 @@ outputs:
with_items: "{{ swift_services_enabled.results }}"
when:
- step|int == 1
- release == 'ocata'
- release == 'rocky'
- item.rc == 0

+ 2
- 2
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml View File

@@ -40,7 +40,7 @@ parameters:
constraints:
- allowed_values: ['tripleo-repos', 'custom-script']
FastForwardRepoArgs:
default: {'tripleo_repos': {'ocata': '-b ocata current', 'pike': '-b pike current', 'queens': '-b queens current'}}
default: {'tripleo_repos': {'rocky': '-b rocky current', 'stein': '-b stein current', 'train': '-b train current'}}
type: json
FastForwardCustomRepoScriptContent:
default: |
@@ -48,7 +48,7 @@ parameters:
set -e
echo "If you use FastForwardRepoType 'custom-script' you have to provide the upgrade repo script content."
echo "It will be installed as /root/ffu_upgrade_repo.sh on the node"
echo "and passed the upstream name (ocata, pike, queens) of the release as first argument"
echo "and passed the upstream name (rocky, stein, train) of the release as first argument"
exit 1
type: string
UpgradeLeappEnabled:


Loading…
Cancel
Save