openstack/fuel-library
Code Issues Proposed changes

new 'nova_api_vip' parameter

Browse Source 
+ reformat
+ Anchor['quantum-l3-cellar'] for fixating 'at end of class' execution position
This commit is contained in:
Sergey Vasilenko 2013-07-04 17:15:49 +04:00
parent 3fa9050153
commit b1153b05cc
8 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/openstack/examples/site_openstack_compact_fordocs.pp
View File

@ -722,6 +722,7 @@ node /fuel-quantum/ {
db_host => $internal_virtual_ip,
service_endpoint => $internal_virtual_ip,
auth_host => $internal_virtual_ip,
nova_api_vip => $internal_virtual_ip,
internal_address => $internal_address,
public_interface => $public_int,
private_interface => $private_interface,

1
deployment/puppet/openstack/examples/site_openstack_ha_compact.pp
View File

@ -773,6 +773,7 @@ node /fuel-quantum/ {
db_host => $internal_virtual_ip,
service_endpoint => $internal_virtual_ip,
auth_host => $internal_virtual_ip,
nova_api_vip => $internal_virtual_ip,
internal_address => $internal_address,
public_interface => $public_int,
private_interface => $private_interface,

1
deployment/puppet/openstack/examples/site_openstack_ha_full.pp
View File

@ -842,6 +842,7 @@ node /fuel-quantum/ {
db_host => $internal_virtual_ip,
service_endpoint => $internal_virtual_ip,
auth_host => $internal_virtual_ip,
nova_api_vip => $internal_virtual_ip,
internal_address => $internal_address,
public_interface => $public_int,
private_interface => $private_interface,

4
deployment/puppet/openstack/examples/site_openstack_ha_minimal.pp
View File

@ -164,6 +164,9 @@ $quantum_netnode_on_cnt = true
#$quantum_host = $internal_virtual_ip
# a string "password" value that should be configured to authenticate requests for metadata
# from quantum-metadata-proxy to nova-api
$quantum_metadata_proxy_shared_secret = "connecting_nova-api_and_quantum-metadata-agent"
# Specify network creation criteria:
# Should puppet automatically create networks?
@ -689,6 +692,7 @@ node /fuel-quantum/ {
db_host => $internal_virtual_ip,
service_endpoint => $internal_virtual_ip,
auth_host => $internal_virtual_ip,
nova_api_vip => $internal_virtual_ip,
internal_address => $internal_address,
public_interface => $public_int,
private_interface => $private_interface,

1
deployment/puppet/openstack/examples/site_openstack_simple.pp
View File

@ -503,6 +503,7 @@ class simple_controller (
db_host => $controller_internal_address,
service_endpoint => $controller_internal_address,
auth_host => $controller_internal_address,
nova_api_vip => $controller_internal_address,
internal_address => $internal_address,
public_interface => $public_int,
private_interface => $private_interface,

1
deployment/puppet/openstack/manifests/controller_ha.pp
View File

@ -319,6 +319,7 @@ class openstack::controller_ha (
db_host => $internal_virtual_ip,
service_endpoint => $internal_virtual_ip,
auth_host => $internal_virtual_ip,
nova_api_vip => $internal_virtual_ip,
internal_address => $internal_address,
public_interface => $public_interface,
private_interface => $private_interface,

2
deployment/puppet/openstack/manifests/quantum_router.pp
View File

@ -12,6 +12,7 @@ class openstack::quantum_router (
$create_networks = true,
$segment_range = '1:4094',
$service_endpoint = '127.0.0.1',
$nova_api_vip = '127.0.0.1',
$rabbit_user = 'nova',
$rabbit_nodes = ['127.0.0.1'],
$rabbit_ha_virtual_ip = false,
@ -94,6 +95,7 @@ class openstack::quantum_router (
auth_password => $quantum_user_password,
use_namespaces => False,
metadata_ip => $internal_address,
nova_api_vip => $nova_api_vip,
service_provider => $service_provider
}
}

25
deployment/puppet/quantum/manifests/agents/l3.pp
View File

@ -23,6 +23,7 @@ class quantum::agents::l3 (
$gateway_external_net_id = undef,
$handle_internal_only_routers = 'True',
$metadata_ip = '169.254.169.254',
$nova_api_vip = '127.0.0.1',
$metadata_port = 8775,
$polling_interval = 3,
$service_provider = 'generic'
@ -71,8 +72,8 @@ class quantum::agents::l3 (
'DEFAULT/admin_password': value => $auth_password;
'DEFAULT/admin_tenant_name': value => $auth_tenant;
'DEFAULT/external_network_bridge': value => $external_network_bridge;
# todo: check for compatible with quantum-metadata-agent
'DEFAULT/metadata_ip': value => $metadata_ip;
## todo: check for compatible with quantum-metadata-agent
#'DEFAULT/metadata_ip': value => $metadata_ip;
#'DEFAULT/router_id': value => $router_id;
#'DEFAULT/gateway_external_net_id': value => $gateway_external_net_id;
}
@ -315,14 +316,15 @@ class quantum::agents::l3 (
# Quantum metadata agent starts only under pacemaker
# and co-located with l3-agent
class {'quantum::agents::metadata':
debug => $debug,
auth_tenant => $auth_tenant,
auth_user => $auth_user,
auth_url => $auth_url,
auth_region => $auth_region,
#$metadata_ip = '127.0.0.1',
#$auth_password
#$shared_secret
debug => $debug,
auth_tenant => $auth_tenant,
auth_user => $auth_user,
auth_url => $auth_url,
auth_region => $auth_region,
metadata_ip => $nova_api_vip,
metadata_port => $metadata_port,
auth_password => $auth_password,
shared_secret => $::quantum_metadata_proxy_shared_secret
}
} else {
service { 'quantum-l3':
@ -335,8 +337,9 @@ class quantum::agents::l3 (
}
}
anchor {'quantum-l3-cellar': }
Anchor['quantum-l3-cellar'] -> Anchor['quantum-l3-done']
anchor {'quantum-l3-done': }
Anchor['quantum-l3'] -> Anchor['quantum-l3-done']
}