openstack/fuel-library
Code Issues Proposed changes

add cinder and quantum conditionals. quantum = false, cinder = true by default

Browse Source
This commit is contained in:
Vladimir Kuklin
2012-11-06 13:21:57 +04:00
parent 68fd93ea3a
commit 71d5957706
5 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@ $nova_user_password = 'nova'
$rabbit_password = 'nova'
$rabbit_user = 'nova'
$glance_backend ='file'
$quantum = false
$cinder = true
$openstack_version = {
'keystone' => latest,
'glance' => latest,
@@ -68,7 +70,9 @@ node /fuel-0[12]/ {
rabbit_nodes => $controller_hostnames,
memcached_servers => $controller_hostnames,
export_resources => false,
glance_backend => $glance_backend
glance_backend => $glance_backend,
quantum => $quantum,
cinder => $cinder,
}
}

7
deployment/puppet/openstack/examples/site_openstack_swift_compact.pp
View File

@@ -34,6 +34,8 @@ $swift_local_net_ip = $ipaddress_eth0
$swift_proxy_address = '10.0.126.253'
$controller_node_public = $internal_virtual_ip
$glance_backend = 'swift'
$quantum = false
$cinder = true
$openstack_version = {
'keystone' => 'latest',
'glance' => 'latest',
@@ -77,7 +79,10 @@ class compact_controller {
memcached_servers => $controller_hostnames,
export_resources => false,
glance_backend => $glance_backend,
swift_proxies => $swift_proxies
swift_proxies => $swift_proxies,
quantum => $quantum,
cinder => $cinder,
}
class { 'swift::keystone::auth':
password => $swift_user_password,

7
deployment/puppet/openstack/examples/site_openstack_swift_standalone.pp
View File

@@ -34,6 +34,8 @@ $swift_local_net_ip = $ipaddress_eth0
$swift_proxy_address = '10.0.48.253'
$controller_node_public = $internal_virtual_ip
$glance_backend = 'swift'
$quantum = false
$cinder = true
$openstack_version = {
'keystone' => 'latest',
'glance' => 'latest',
@@ -77,7 +79,10 @@ node /fuel-0[12]/ {
memcached_servers => $controller_hostnames,
export_resources => false,
glance_backend => $glance_backend,
swift_proxies => $swift_proxies
swift_proxies => $swift_proxies,
quantum => $quantum,
cinder => $cinder,
}
class { 'swift::keystone::auth':

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

@@ -38,6 +38,8 @@ $verbose = true
# by default it does not enable atomatically adding floating IPs
$auto_assign_floating_ip = false
$quantum = false
$cinder = true
stage {'openstack-custom-repo': before => Stage['main']}
include openstack::mirantis_repos
@@ -115,6 +117,8 @@ node /fuel-01/ {
rabbit_password => $rabbit_password,
rabbit_user => $rabbit_user,
export_resources => false,
quantum => $quantum,
cinder => $cinder,
}
class { 'openstack::auth_file':

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

@@ -83,7 +83,8 @@ class openstack::controller_ha (
$auto_assign_floating_ip, $mysql_root_password, $admin_email, $admin_password,
$keystone_db_password, $keystone_admin_token, $glance_db_password, $glance_user_password,
$nova_db_password, $nova_user_password, $rabbit_password, $rabbit_user,
$rabbit_nodes, $memcached_servers, $export_resources, $glance_backend='file', $swift_proxies=undef
$rabbit_nodes, $memcached_servers, $export_resources, $glance_backend='file', $swift_proxies=undef,
$quantum = false, $cinder = false
) {
$which = $::hostname ? { $master_hostname => 0, default => 1 }
@@ -252,7 +253,9 @@ class openstack::controller_ha (
db_host => $internal_virtual_ip,
service_endpoint => $internal_virtual_ip,
glance_backend => $glance_backend,
require => Service['keepalived']
require => Service['keepalived'],
quantum => $quantum,
cinder => $cinder,
}
class { 'openstack::auth_file':