Merge "[TRAIN ONLY] Add FFU parameters in lifecycle env files." into stable/train

This commit is contained in:
Zuul 2020-06-16 11:15:51 +00:00 committed by Gerrit Code Review
commit fd05fe13c7
2 changed files with 25 additions and 2 deletions

View File

@ -6,3 +6,22 @@ parameter_defaults:
UpgradeLevelNovaCompute: '' UpgradeLevelNovaCompute: ''
UpgradeInitCommonCommand: '' UpgradeInitCommonCommand: ''
UpgradeInitCommand: '' UpgradeInitCommand: ''
# FFU params
# Stein db migration images
# being set in tripleo-common
ContainerCinderApiImageStein: ''
ContainerGlanceApiImageStein: ''
ContainerHeatEngineImageStein: ''
ContainerIronicApiImageStein: ''
ContainerIronicInspectorImageStein: ''
ContainerKeystoneImageStein: ''
ContainerMistralApiImageStein: ''
ContainerNeutronApiImageStein: ''
ContainerNovaApiImageStein: ''
ContainerNovaConductorImageStein: ''
# Ceph 3 image set in tripleo-common
ContainerCeph3DaemonImage: ''
# Unset operating system upgrade
UpgradeLeappEnabled: false
UpgradeLeappToInstall: []
UpgradeLeappToRemove: []

View File

@ -10,8 +10,12 @@ resource_registry:
parameter_defaults: parameter_defaults:
EnablePackageInstall: true EnablePackageInstall: true
UpgradeLevelNovaCompute: auto UpgradeLevelNovaCompute: auto
UpgradeLeappToRemove: ['openvswitch2.11','ovn2.11']
UpgradeLeappToInstall: ['openvswitch2.13','ovn2.13']
UpgradeInitCommonCommand: | UpgradeInitCommonCommand: |
#!/bin/bash #!/bin/bash
set -eu set -eu
# FFU parameters
# Set operating system upgrade
UpgradeLeappEnabled: true
# OpenStack packages to upgrade with the OS upgrade.
UpgradeLeappToRemove: ['openvswitch2.11','ovn2.11']
UpgradeLeappToInstall: ['openvswitch2.13','ovn2.13']