openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix MidoNet errors 

Some assignments must be fixed in order to make run midonet with HA
pacemaker properly and when the network isolation is enabled.

Change-Id: I69fb3a1911cfe3baea3349da8f3e185dddf60a95
(cherry picked from commit b2593e0722)
This commit is contained in:
Jaume Devesa 2016-01-15 17:30:36 +00:00 committed by James Slagle
parent f65fac909f
commit 58270f55f5
4 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
puppet/all-nodes-config.yaml
View File

@ -225,6 +225,15 @@ resources:
list_join:
- "','"
- {get_param: neutron_api_node_ips}
# TODO: pass a `midonet_api_node_ips` var
midonet_api_node_ips:
str_replace:
template: "['SERVERS_LIST']"
params:
SERVERS_LIST:
list_join:
- "','"
- {get_param: neutron_api_node_ips}
keystone_public_api_node_ips:
str_replace:
template: "['SERVERS_LIST']"

15
puppet/manifests/overcloud_controller.pp
View File

@ -237,7 +237,8 @@ if hiera('step') >= 3 {
if hiera('enable_zookeeper_on_controller') {
class {'::tripleo::cluster::zookeeper':
zookeeper_server_ips => $zookeeper_node_ips,
zookeeper_client_ip => $ipaddress,
# TODO: create a 'bind' hiera key for zookeeper
zookeeper_client_ip => hiera('neutron::bind_host'),
zookeeper_hostnames => hiera('controller_node_names')
}
}
@ -246,7 +247,8 @@ if hiera('step') >= 3 {
if hiera('enable_cassandra_on_controller') {
class {'::tripleo::cluster::cassandra':
cassandra_servers => $cassandra_node_ips,
cassandra_ip => $ipaddress
# TODO: create a 'bind' hiera key for cassandra
cassandra_ip => hiera('neutron::bind_host'),
}
}
@ -257,10 +259,11 @@ if hiera('step') >= 3 {
class {'::tripleo::network::midonet::api':
zookeeper_servers => $zookeeper_node_ips,
vip => $ipaddress,
keystone_ip => $ipaddress,
vip => hiera('tripleo::loadbalancer::public_virtual_ip'),
keystone_ip => hiera('tripleo::loadbalancer::public_virtual_ip'),
keystone_admin_token => hiera('keystone::admin_token'),
bind_address => $ipaddress,
# TODO: create a 'bind' hiera key for api
bind_address => hiera('neutron::bind_host'),
admin_password => hiera('admin_password')
}
@ -304,7 +307,7 @@ if hiera('step') >= 3 {
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
class {'::neutron::plugins::midonet':
midonet_api_ip => $ipaddress,
midonet_api_ip => hiera('tripleo::loadbalancer::public_virtual_ip'),
keystone_tenant => hiera('neutron::server::auth_tenant'),
keystone_password => hiera('neutron::server::auth_password')
}

19
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -599,8 +599,9 @@ if hiera('step') >= 3 {
if hiera('enable_zookeeper_on_controller') {
class {'::tripleo::cluster::zookeeper':
zookeeper_server_ips => $zookeeper_node_ips,
zookeeper_client_ip => $ipaddress,
zookeeper_hostnames => hiera('controller_node_names')
# TODO: create a 'bind' hiera key for zookeeper
zookeeper_client_ip => hiera('neutron::bind_host'),
zookeeper_hostnames => split(hiera('controller_node_names'), ',')
}
}
@ -608,7 +609,8 @@ if hiera('step') >= 3 {
if hiera('enable_cassandra_on_controller') {
class {'::tripleo::cluster::cassandra':
cassandra_servers => $cassandra_node_ips,
cassandra_ip => $ipaddress
# TODO: create a 'bind' hiera key for cassandra
cassandra_ip => hiera('neutron::bind_host'),
}
}
@ -618,11 +620,12 @@ if hiera('step') >= 3 {
}
class {'::tripleo::network::midonet::api':
zookeeper_servers => hiera('neutron_api_node_ips'),
vip => $public_vip,
keystone_ip => $public_vip,
zookeeper_servers => $zookeeper_node_ips,
vip => hiera('tripleo::loadbalancer::public_virtual_ip'),
keystone_ip => hiera('tripleo::loadbalancer::public_virtual_ip'),
keystone_admin_token => hiera('keystone::admin_token'),
bind_address => $ipaddress,
# TODO: create a 'bind' hiera key for api
bind_address => hiera('neutron::bind_host'),
admin_password => hiera('admin_password')
}
@ -648,7 +651,7 @@ if hiera('step') >= 3 {
}
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
class {'::neutron::plugins::midonet':
midonet_api_ip => $public_vip,
midonet_api_ip => hiera('tripleo::loadbalancer::public_virtual_ip'),
keystone_tenant => hiera('neutron::server::auth_tenant'),
keystone_password => hiera('neutron::server::auth_password')
}

2
puppet/vip-config.yaml
View File

@ -16,6 +16,8 @@ resources:
keystone_admin_api_vip: {get_input: keystone_admin_api_vip}
keystone_public_api_vip: {get_input: keystone_public_api_vip}
neutron_api_vip: {get_input: neutron_api_vip}
# TODO: pass a `midonet_api_vip` var
midonet_api_vip: {get_input: neutron_api_vip}
cinder_api_vip: {get_input: cinder_api_vip}
glance_api_vip: {get_input: glance_api_vip}
glance_registry_vip: {get_input: glance_registry_vip}