diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-17 20:13:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-17 20:13:41 +0000 |
| commit | 6604208fa88956c667f60c0e54663de5908d4edc (patch) | |
| tree | 0cb31feaec5399682b64a418047e99e299e11601 /puppet/hieradata | |
| parent | cde9207a0da4968cb731937f5e7012a1d646bb00 (diff) | |
| parent | 28d5d566f95dfade66d7c48c4b9565842c4571ad (diff) | |
Merge "neutron: enable nova-event-callback by default"
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/common.yaml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 030f661d..95f5ccb8 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -9,8 +9,6 @@ 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 nova::network::neutron::dhcp_domain: '' neutron::allow_overlapping_ips: true |