Merge "Use node traits during upgrade"

This commit is contained in:
Zuul 2018-03-13 16:35:26 +00:00 committed by Gerrit Code Review
commit 6da5caa593
2 changed files with 0 additions and 6 deletions

View File

@ -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'

View File

@ -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'