Merge "Fix standalone upgrade train failure"

2020-05-30 06:19:55 +00:00 · 2020-05-30 06:19:55 +00:00 · b0cf13c002
commit b0cf13c002
parent 0466117cb2 a06d298745
1 changed files with 6 additions and 1 deletions
--- a/roles/standalone-upgrade/templates/standalone.sh.j2
+++ b/roles/standalone-upgrade/templates/standalone.sh.j2
@ -1,9 +1,14 @@
+PROMPT_ANSWER=""
+if openstack tripleo upgrade --help | grep -qe "--yes"; then
+    PROMPT_ANSWER="--yes"
+fi
+
 sudo yum update -y \
    python-tripleoclient \
    openstack-tripleo-common \
    openstack-tripleo-heat-templates

-sudo openstack tripleo upgrade \
+sudo openstack tripleo upgrade $PROMPT_ANSWER \
  --templates \
  --local-ip={{ standalone_ip }}/{{ standalone_network_prefix }} \
  -e {{ overcloud_templates_path }}/environments/standalone/standalone-tripleo.yaml \