summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorDerek Higgins <derekh@redhat.com>2016-05-10 12:21:53 +0100
committerDan Prince <dprince@redhat.com>2016-05-10 13:33:39 -0400
commitd76f70edcd3bbf0308071638cb4ee8eb2f70503a (patch)
treeff7b9c4052c3fa5d3c4ce3caf89864e7f8221b0f /puppet/hieradata
parentafbd7231cd0539f9e32afc673f080c99e256299b (diff)
Set nova neutron auth back to 'v3password'.
Puppet-nova recently changed the default neutron auth setting in I3416ae594e972e40ff0336779258a887987e46b1 to 'password'. This single setting seems to break the tripleo upgrades job. Setting it here manually for now and following up in puppet-nova. Closes-bug: #1580076 Change-Id: I3f38a3e1ef3378a272a51ecbc1e8a801c8d3608a
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/compute.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 865210c9..1e888f39 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -11,6 +11,8 @@ nova::compute::libvirt::migration_support: true
nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}"
+nova::network::neutron::neutron_auth_type: 'v3password'
+
# Changing the default from 512MB. The current templates can not deploy
# overclouds with swap. On an idle compute node, we see ~1024MB of RAM
# used. 2048 is suggested to account for other possible operations for