Merge "Add Swift to the major upgrade CI"

scripts/tripleo.sh

@@ -814,6 +814,10 @@ function overcloud_sanitytest_create {
                 openstack stack create ${SANITYTEST_CONTENT_NAME} --template /tmp/${SANITYTEST_CONTENT_NAME}.yaml
                 openstack stack list
                 ;;
+            "swift_proxy" )
+                openstack container create ${SANITYTEST_CONTENT_NAME}
+                openstack container list
+                ;;
         esac
     done
 }
@@ -840,6 +844,9 @@ function overcloud_sanitytest_check {
                 # on the actual version, but this is still good for debugging
                 run_cmd openstack orchestration template version list
                 ;;
+            "swift_proxy" )
+                run_cmd openstack container show ${SANITYTEST_CONTENT_NAME}
+                ;;
         esac
     done
 }
@@ -864,6 +871,9 @@ function overcloud_sanitytest_cleanup {
             "heat_api" )
                 run_cmd openstack stack delete --yes ${SANITYTEST_CONTENT_NAME}
                 ;;
+            "swift_proxy" )
+                run_cmd openstack container delete ${SANITYTEST_CONTENT_NAME}
+                ;;
         esac
     done
 }

test-environments/multinode_major_upgrade.yaml

@@ -24,6 +24,9 @@ parameter_defaults:
     - OS::TripleO::Services::HeatApiCfn
     - OS::TripleO::Services::HeatApiCloudwatch
     - OS::TripleO::Services::HeatEngine
+    - OS::TripleO::Services::SwiftProxy
+    - OS::TripleO::Services::SwiftStorage
+    - OS::TripleO::Services::SwiftRingBuilder
     - OS::TripleO::Services::MySQL
     - OS::TripleO::Services::RabbitMQ
     - OS::TripleO::Services::HAproxy
@@ -39,5 +42,3 @@ parameter_defaults:
     # Required for Centos 7.3 and Qemu 2.6.0
     nova::compute::libvirt::libvirt_cpu_mode: 'none'
   SwiftCeilometerPipelineEnabled: False
-  # FIXME(shardy) remove the file backend when we add swift
-  GlanceBackend: file