Merge "Fix MidoNet errors"

This commit is contained in:
Jenkins 2016-02-09 08:52:30 +00:00 committed by Gerrit Code Review
commit 3bd5d13c53
4 changed files with 31 additions and 14 deletions

View File

@ -227,6 +227,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']"

View File

@ -246,7 +246,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')
}
}
@ -255,7 +256,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'),
}
}
@ -266,10 +268,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')
}
@ -312,7 +315,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')
}

View File

@ -610,8 +610,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'), ',')
}
}
@ -619,7 +620,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'),
}
}
@ -629,11 +631,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')
}
@ -660,7 +663,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')
}

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}