openstack/fuel-library
Code Issues Proposed changes

workaround qpid_hosts is internal_virtual_ip

Browse Source
This commit is contained in:
Matthew Mosesohn 2013-07-24 14:28:28 +04:00 committed by Vladimir Kuklin
parent d8b3f03a5d
commit f6ce3550fd
6 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -602,7 +602,7 @@ class compact_controller (
rabbit_nodes => $controller_hostnames,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_hostnames,
qpid_nodes => [$internal_virtual_ip],
memcached_servers => $controller_hostnames,
export_resources => false,
glance_backend => $glance_backend,
@ -754,7 +754,7 @@ node /fuel-compute-[\d+]/ {
rabbit_ha_virtual_ip => $internal_virtual_ip,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_internal_addresses,
qpid_nodes => [$internal_virtual_ip],
glance_api_servers => "${internal_virtual_ip}:9292",
vncproxy_host => $public_virtual_ip,
verbose => $verbose,
@ -820,7 +820,7 @@ node /fuel-quantum/ {
rabbit_ha_virtual_ip => $internal_virtual_ip,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_internal_addresses,
qpid_nodes => [$internal_virtual_ip],
quantum => $quantum,
quantum_user_password => $quantum_user_password,
quantum_db_password => $quantum_db_password,

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

@ -652,7 +652,7 @@ class compact_controller (
rabbit_nodes => $controller_hostnames,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_internal_ipaddresses,
qpid_nodes => [$internal_virtual_ip],
memcached_servers => $controller_hostnames,
export_resources => false,
glance_backend => $glance_backend,
@ -762,7 +762,7 @@ node /fuel-controller-[\d+]/ {
rabbit_ha_virtual_ip => $internal_virtual_ip,
syslog_log_level => $syslog_log_level,
syslog_log_facility_cinder => $syslog_log_facility_cinder,
qpid_nodes => $controller_internal_addresses,
qpid_nodes => [$internal_virtual_ip],
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
}
@ -829,7 +829,7 @@ node /fuel-compute-[\d+]/ {
rabbit_password => $rabbit_password,
rabbit_user => $rabbit_user,
rabbit_ha_virtual_ip => $internal_virtual_ip,
qpid_nodes => $controller_internal_ipaddresses,
qpid_nodes => [$internal_virtual_ip],
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
glance_api_servers => "${internal_virtual_ip}:9292",
@ -895,7 +895,7 @@ node /fuel-quantum/ {
rabbit_user => $rabbit_user,
rabbit_nodes => $controller_hostnames,
rabbit_ha_virtual_ip => $internal_virtual_ip,
qpid_nodes => $controller_internal_ipaddresses,
qpid_nodes => [$internal_virtual_ip],
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
quantum => $quantum,

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

@ -709,7 +709,7 @@ class ha_controller (
rabbit_nodes => $controller_hostnames,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_internal_ipaddresses,
qpid_nodes => [$internal_virtual_ip],
memcached_servers => $controller_hostnames,
export_resources => false,
glance_backend => $glance_backend,
@ -807,7 +807,7 @@ node /fuel-compute-[\d+]/ {
rabbit_ha_virtual_ip => $internal_virtual_ip,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_internal_ipaddresses,
qpid_nodes => [$internal_virtual_ip],
glance_api_servers => "${internal_virtual_ip}:9292",
vncproxy_host => $public_virtual_ip,
verbose => $verbose,
@ -883,12 +883,12 @@ node /fuel-swift-[\d+]/ {
rabbit_password => $rabbit_password,
rabbit_user => $rabbit_user,
rabbit_ha_virtual_ip => $internal_virtual_ip,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => [$internal_virtual_ip],
sync_rings => ! $primary_proxy,
syslog_log_level => $syslog_log_level,
syslog_log_facility_cinder => $syslog_log_facility_cinder,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_internal_ipaddresses,
}
}
@ -968,7 +968,7 @@ node /fuel-quantum/ {
rabbit_ha_virtual_ip => $internal_virtual_ip,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_internal_ipaddresses,
qpid_nodes => [$internal_virtual_ip],
quantum => $quantum,
quantum_user_password => $quantum_user_password,
quantum_db_password => $quantum_db_password,

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

@ -616,7 +616,7 @@ class compact_controller (
rabbit_nodes => $controller_hostnames,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_internal_ipaddresses,
qpid_nodes => [$internal_virtual_ip],
memcached_servers => $controller_hostnames,
export_resources => false,
glance_backend => $glance_backend,
@ -743,7 +743,7 @@ node /fuel-compute-[\d+]/ {
rabbit_ha_virtual_ip => $internal_virtual_ip,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_internal_ipaddresses,
qpid_nodes => [$internal_virtual_ip],
glance_api_servers => "${internal_virtual_ip}:9292",
vncproxy_host => $public_virtual_ip,
verbose => $verbose,
@ -809,7 +809,7 @@ node /fuel-quantum/ {
rabbit_ha_virtual_ip => $internal_virtual_ip,
qpid_password => $rabbit_password,
qpid_user => $rabbit_user,
qpid_nodes => $controller_internal_ipaddresses,
qpid_nodes => [$internal_virtual_ip],
quantum => $quantum,
quantum_user_password => $quantum_user_password,
quantum_db_password => $quantum_db_password,

7
deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
View File

@ -130,7 +130,8 @@ class compact_controller {
queue_provider => $::queue_provider,
qpid_password => $rabbit_hash[password],
qpid_user => $rabbit_user,
qpid_nodes => $controller_hostnames,
qpid_nodes => [$management_vip],
memcached_servers => $controller_nodes,
export_resources => false,
glance_backend => $glance_backend,
swift_proxies => $controller_internal_addresses,
@ -266,7 +267,7 @@ class virtual_ips () {
queue_provider => $::queue_provider,
qpid_password => $rabbit_hash[password],
qpid_user => $rabbit_user,
qpid_nodes => $controller_nodes,
qpid_nodes => [$management_vip],
auto_assign_floating_ip => $bool_auto_assign_floating_ip,
glance_api_servers => "${management_vip}:9292",
vncproxy_host => $public_vip,
@ -315,7 +316,7 @@ class virtual_ips () {
rabbit_nodes => $management_vip,
qpid_password => $rabbit_hash[password],
qpid_user => $rabbit_user,
qpid_nodes => $controller_hostnames,
qpid_nodes => [$management_vip],
volume_group => 'cinder',
manage_volumes => true,
enabled => true,

30
deployment/puppet/qpid/manifests/server.pp
View File

@ -38,21 +38,21 @@ class qpid::server(
ensure => $package_ensure,
}
qpid_safe_package { $qpid::params::additional_packages : }
file { '/usr/local/bin/qpid-setup-routes.sh':
ensure => present,
owner => 'root',
group => 'root',
mode => 755,
content => template('qpid/qpid-setup-routes.sh.erb'),
}
exec { "propagate_qpid_routes":
path => "/usr/bin/:/bin:/usr/sbin",
command => "bash /usr/local/bin/qpid-setup-routes.sh",
subscribe => File['/usr/local/bin/qpid-setup-routes.sh'],
logoutput => true,
}
#Disable routing because it creates duplicates. Need upstream fixes
# file { '/usr/local/bin/qpid-setup-routes.sh':
# ensure => present,
# owner => 'root',
# group => 'root',
# mode => 755,
# content => template('qpid/qpid-setup-routes.sh.erb'),
# }
#
# exec { "propagate_qpid_routes":
# path => "/usr/bin/:/bin:/usr/sbin",
# command => "bash /usr/local/bin/qpid-setup-routes.sh",
# subscribe => File['/usr/local/bin/qpid-setup-routes.sh'],
# logoutput => true,
# }
}
if $auth == 'yes' {
qpid_user { 'qpid_user':