Use node traits during upgrade

Now that the queens branch has support for node traits in the devstack
plugin [1], we can apply node traits when testing upgrades from queens
or later.

[1] https://review.openstack.org/551938

Change-Id: I99b9487d849ecd5241657d6ca91c2e9f9f7dfcf8
Related-Bug: #1722194
Related-Bug: #1750027
This commit is contained in:
Mark Goddard 2018-03-12 16:18:51 +00:00
parent 49946235be
commit cef19cbf0a
2 changed files with 0 additions and 6 deletions

View File

@ -135,9 +135,6 @@
cat << 'EOF' >> ironic-extra-vars cat << 'EOF' >> ironic-extra-vars
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
# TODO(mgoddard): Remove this when the queens ironic devstack
# plugin has support for registering traits.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_TRAITS=\"\""
EOF EOF
chdir: '{{ ansible_user_dir }}/workspace' chdir: '{{ ansible_user_dir }}/workspace'

View File

@ -78,9 +78,6 @@
cat << 'EOF' >> ironic-extra-vars cat << 'EOF' >> ironic-extra-vars
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
# TODO(mgoddard): Remove this when the queens ironic devstack
# plugin has support for registering traits.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_TRAITS=\"\""
EOF EOF
chdir: '{{ ansible_user_dir }}/workspace' chdir: '{{ ansible_user_dir }}/workspace'