diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-03-12 10:28:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-03-12 10:28:26 +0000 |
| commit | 8772095c427c0c90747077271c70d84b16741359 (patch) | |
| tree | 764b8541384dbb809655ccf1458a9eb02fcf6335 /puppet/hieradata/common.yaml | |
| parent | 925bd3864f693c890c84d69052fb03135a947b5c (diff) | |
| parent | 10c2cfab45018aeb52f4f4b9499f5dc98b075d78 (diff) | |
Merge "Puppet: Configure neutron_api_class on controller"
Diffstat (limited to 'puppet/hieradata/common.yaml')
| -rw-r--r-- | puppet/hieradata/common.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index a75bbe39..14ba97e2 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -6,3 +6,9 @@ ceilometer::agent::auth::auth_region: 'regionOne' # FIXME: Might be better to use 'service' tenant here but this requires # changes in the tripleo-incubator keystone role setup ceilometer::agent::auth::auth_tenant_name: 'admin' + +nova::network::neutron::neutron_admin_tenant_name: 'service' +nova::network::neutron::neutron_admin_username: 'neutron' +nova::network::neutron::vif_plugging_is_fatal: false +nova::network::neutron::vif_plugging_timeout: 30 + |