summaryrefslogtreecommitdiff
path: root/playbooks
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2018-03-12 16:18:51 +0000
committerMark Goddard <mark@stackhpc.com>2018-03-12 16:20:36 +0000
commitcef19cbf0a4d7b179de5d4448e247e9db1a79831 (patch)
treec3e6d3504670fc156d2e398eb189806a3b0ac799 /playbooks
parent49946235bef67b0b051c7d9ae6655d9f2e9bcde2 (diff)
downloadironic-cef19cbf0a4d7b179de5d4448e247e9db1a79831.tar.gz
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
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml3
-rw-r--r--playbooks/legacy/grenade-dsvm-ironic/run.yaml3
2 files changed, 0 insertions, 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 771b9a5d5..a8b251db5 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 eac5f3526..a36fcfd50 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'