openstack
/
trove
Code Issues Proposed changes

Merge "Some clean up"

This commit is contained in:
Zuul 2019-09-20 02:02:39 +00:00 committed by Gerrit Code Review
parent a67a6ed2ef 757a873963
commit d290514706
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

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

3
integration/scripts/trovestack.rc
View File

@ -50,8 +50,6 @@ PATH_OPENSTACKCLIENT=$DEST/python-openstackclient
PATH_PYTHON_SWIFTCLIENT=$DEST/python-swiftclient PATH_PYTHON_SWIFTCLIENT=$DEST/python-swiftclient
PATH_PYTHON_TROVECLIENT=$DEST/python-troveclient PATH_PYTHON_TROVECLIENT=$DEST/python-troveclient
PATH_TROVE_DASHBOARD=$DEST/trove-dashboard 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 # Save the state of TROVE_BRANCH first, since it's used in trovestack
TROVE_BRANCH_ORIG=${TROVE_BRANCH} TROVE_BRANCH_ORIG=${TROVE_BRANCH}
@ -91,7 +89,6 @@ SERVICE_PASSWORD=${SERVICE_PASSWORD:-"secretservice"}
# Swift hash used by devstack. # Swift hash used by devstack.
SWIFT_HASH=12go358snjw24501 SWIFT_HASH=12go358snjw24501
# Swift Disk Image # Swift Disk Image
SWIFT_DATA_DIR=${DATA_DIR}/swift SWIFT_DATA_DIR=${DATA_DIR}/swift
SWIFT_DISK_IMAGE=${SWIFT_DATA_DIR}/drives/images/swift.img SWIFT_DISK_IMAGE=${SWIFT_DATA_DIR}/drives/images/swift.img

14
playbooks/image-build/run.yaml
View File

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