Revert "neutron: enable nova-event-callback by default"
This reverts commit 98cc800059
.
Change-Id: Ib82df79d75f338b2a5b52bbb86675ec09a4aa018
Closes-Bug: 1531486
This commit is contained in:
parent
dea98553e1
commit
d8357912cf
|
@ -558,9 +558,6 @@ parameters:
|
|||
NeutronApiVirtualIP:
|
||||
type: string
|
||||
default: ''
|
||||
NovaApiVirtualIP:
|
||||
type: string
|
||||
default: ''
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
|
|
|
@ -949,7 +949,6 @@ resources:
|
|||
neutron_public_url: { get_param: [ EndpointMap, NeutronPublic, uri ] }
|
||||
neutron_admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] }
|
||||
neutron_admin_auth_url: { get_param: [ EndpointMap, KeystoneAdmin, uri ] }
|
||||
nova_internal_url: { get_param: [ EndpointMap, NovaInternal, uri ] }
|
||||
ceilometer_backend: {get_param: CeilometerBackend}
|
||||
ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
|
||||
ceilometer_password: {get_param: CeilometerPassword}
|
||||
|
@ -1251,15 +1250,6 @@ resources:
|
|||
neutron_dsn: {get_input: neutron_dsn}
|
||||
neutron::agents::metadata::auth_url: {get_input: keystone_identity_uri}
|
||||
neutron::db::mysql::password: {get_input: neutron_password}
|
||||
neutron::keystone::auth::public_url: {get_input: neutron_public_url }
|
||||
neutron::keystone::auth::internal_url: {get_input: neutron_internal_url }
|
||||
neutron::keystone::auth::admin_url: {get_input: neutron_admin_url }
|
||||
neutron::keystone::auth::password: {get_input: neutron_password }
|
||||
neutron::keystone::auth::region: {get_input: keystone_region}
|
||||
neutron::server::notifications::nova_url: {get_input: nova_internal_url}
|
||||
neutron::server::notifications::auth_url: {get_input: neutron_admin_auth_url}
|
||||
neutron::server::notifications::tenant_name: 'service'
|
||||
neutron::server::notifications::password: {get_input: nova_password}
|
||||
|
||||
# Ceilometer
|
||||
ceilometer_backend: {get_input: ceilometer_backend}
|
||||
|
|
|
@ -9,6 +9,8 @@ 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
|
||||
|
|
|
@ -230,7 +230,9 @@ if hiera('step') >= 3 {
|
|||
|
||||
include ::neutron
|
||||
include ::neutron::server
|
||||
include ::neutron::server::notifications
|
||||
include ::neutron::agents::l3
|
||||
include ::neutron::agents::dhcp
|
||||
include ::neutron::agents::metadata
|
||||
|
||||
# If the value of core plugin is set to 'nuage',
|
||||
# include nuage core plugin,
|
||||
|
|
|
@ -598,7 +598,6 @@ if hiera('step') >= 3 {
|
|||
manage_service => false,
|
||||
enabled => false,
|
||||
}
|
||||
include ::neutron::server::notifications
|
||||
class { '::neutron::agents::dhcp' :
|
||||
manage_service => false,
|
||||
enabled => false,
|
||||
|
|
Loading…
Reference in New Issue