diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-13 16:35:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-13 16:35:26 +0000 |
| commit | 6da5caa5939bf96c85c9085717de36b15ae8092b (patch) | |
| tree | c5a02e6d4899d6dd4d9c50ccdc56b1e8de94a5d2 /playbooks | |
| parent | b8f316b6077592e4104b564de0497f38729d204d (diff) | |
| parent | cef19cbf0a4d7b179de5d4448e247e9db1a79831 (diff) | |
| download | ironic-6da5caa5939bf96c85c9085717de36b15ae8092b.tar.gz | |
Merge "Use node traits during upgrade"
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml | 3 | ||||
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ironic/run.yaml | 3 |
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' |