aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-17 20:13:41 +0000
committerGerrit Code Review <review@openstack.org>2015-11-17 20:13:41 +0000
commit6604208fa88956c667f60c0e54663de5908d4edc (patch)
tree0cb31feaec5399682b64a418047e99e299e11601
parentcde9207a0da4968cb731937f5e7012a1d646bb00 (diff)
parent28d5d566f95dfade66d7c48c4b9565842c4571ad (diff)
Merge "neutron: enable nova-event-callback by default"
-rw-r--r--os-apply-config/controller.yaml3
-rw-r--r--overcloud-without-mergepy.yaml1
-rw-r--r--puppet/controller.yaml10
-rw-r--r--puppet/hieradata/common.yaml2
-rw-r--r--puppet/manifests/overcloud_controller.pp1
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
6 files changed, 16 insertions, 2 deletions
diff --git a/os-apply-config/controller.yaml b/os-apply-config/controller.yaml
index f84bf5b3..bf32f250 100644
--- a/os-apply-config/controller.yaml
+++ b/os-apply-config/controller.yaml
@@ -554,6 +554,9 @@ parameters:
NeutronApiVirtualIP:
type: string
default: ''
+ NovaApiVirtualIP:
+ type: string
+ default: ''
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 35a473cc..9320ca24 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -899,6 +899,7 @@ resources:
KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
NeutronApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
+ NovaApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
UpdateIdentifier: {get_param: UpdateIdentifier}
Hostname:
str_replace:
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 6aabe572..920bd885 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -893,6 +893,7 @@ 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}
@@ -1200,6 +1201,15 @@ 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}
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
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 63f89ec0..570c43ba 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -227,6 +227,7 @@ 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
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 02988412..2a3f1f92 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -590,6 +590,7 @@ if hiera('step') >= 3 {
manage_service => false,
enabled => false,
}
+ include ::neutron::server::notifications
class { '::neutron::agents::dhcp' :
manage_service => false,
enabled => false,