From cef19cbf0a4d7b179de5d4448e247e9db1a79831 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 12 Mar 2018 16:18:51 +0000 Subject: [PATCH] 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 --- .../legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml | 3 --- playbooks/legacy/grenade-dsvm-ironic/run.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml index 771b9a5d54..a8b251db58 100644 --- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml @@ -135,9 +135,6 @@ cat << 'EOF' >> ironic-extra-vars export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" 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 chdir: '{{ ansible_user_dir }}/workspace' diff --git a/playbooks/legacy/grenade-dsvm-ironic/run.yaml b/playbooks/legacy/grenade-dsvm-ironic/run.yaml index eac5f3526c..a36fcfd504 100644 --- a/playbooks/legacy/grenade-dsvm-ironic/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic/run.yaml @@ -78,9 +78,6 @@ cat << 'EOF' >> ironic-extra-vars export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" 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 chdir: '{{ ansible_user_dir }}/workspace'