Merge "Some clean up"

.zuul.yaml

@@ -44,8 +44,6 @@
         - trove-functional-mysql
         - trove-scenario-mysql-single
         - trove-scenario-mysql-multi
-        - trove-tempest-ipv6-only:
-            voting: false
     experimental:
       jobs:
         - trove-grenade

integration/scripts/trovestack.rc

@@ -50,8 +50,6 @@ PATH_OPENSTACKCLIENT=$DEST/python-openstackclient
 PATH_PYTHON_SWIFTCLIENT=$DEST/python-swiftclient
 PATH_PYTHON_TROVECLIENT=$DEST/python-troveclient
 PATH_TROVE_DASHBOARD=$DEST/trove-dashboard
-PATH_DISKIMAGEBUILDER_ELEMENTS=$(python -c 'import os, diskimage_builder, pkg_resources;print(os.path.abspath(pkg_resources.resource_filename(diskimage_builder.__name__, "elements")))')
-PATH_TRIPLEO_ELEMENTS=$DEST/tripleo-image-elements
 
 # Save the state of TROVE_BRANCH first, since it's used in trovestack
 TROVE_BRANCH_ORIG=${TROVE_BRANCH}
@@ -91,7 +89,6 @@ SERVICE_PASSWORD=${SERVICE_PASSWORD:-"secretservice"}
 
 # Swift hash used by devstack.
 SWIFT_HASH=12go358snjw24501
-
 # Swift Disk Image
 SWIFT_DATA_DIR=${DATA_DIR}/swift
 SWIFT_DISK_IMAGE=${SWIFT_DATA_DIR}/drives/images/swift.img

playbooks/image-build/run.yaml

@@ -5,13 +5,13 @@
         path: '{{ ansible_user_dir }}/images'
         state: directory
     - name: Build Trove guest image
-      shell: >
-        ./trovestack build-image
-          {{ datastore_type }}
-          {{ guest_os }}
-          {{ guest_os_release }}
-          false
-          {{ guest_username }}
+      shell: >-
+        ./trovestack build-image \
+          {{ datastore_type }} \
+          {{ guest_os }} \
+          {{ guest_os_release }} \
+          false \
+          {{ guest_username }} \
           {{ ansible_user_dir }}/images/trove-{{ zuul.branch }}-{{ datastore_type }}-{{ guest_os }}-{{ guest_os_release }}.qcow2
       args:
         chdir: "{{ ansible_user_dir }}/src/opendev.org/openstack/trove/integration/scripts"