stackforge/puppet-openstack
Code Issues Proposed changes

Fix smoke tests and update examples in README

Browse Source 
* Add missing params and remove deprecated params from tests
* Fix classname changes
* Add new smoketests for testfile and auth_file
* Update README with new params

Change-Id: Ib25fcd6545aa704f64dd0709a75700480eaff684
This commit is contained in:
William Van Hevelingen
2013-07-16 12:44:36 -07:00
parent d52895d5ad
commit e4297c1ca7
8 changed files with 75 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
README.md
View File

@@ -140,12 +140,19 @@ class { 'openstack::all':
admin_email => 'some_admin@some_company',
admin_password => 'admin_password',
keystone_admin_token => 'keystone_admin_token',
keystone_db_password => 'keystone_db_password',
cinder_db_password => 'cinder_db_password',
cinder_user_password => 'cinder_user_password',
nova_user_password => 'nova_user_password',
nova_db_password => 'nova_db_password',
glance_user_password => 'glance_user_password',
glance_db_password => 'glance_db_password',
rabbit_password => 'rabbit_password',
rabbit_user => 'rabbit_user',
libvirt_type => 'kvm',
fixed_range => '10.0.0.0/24',
secret_key => '12345',
quantum => false,
}
```
@@ -178,13 +185,20 @@ class { 'openstack::controller':
fixed_range => '10.0.0.0/24',
multi_host => false,
network_manager => 'nova.network.manager.FlatDHCPManager',
admin_email => 'admin_email',
admin_email => 'root@localhost',
admin_password => 'admin_password',
cinder_db_password => 'cinder_db_password',
cinder_user_password => 'cinder_user_password',
keystone_admin_token => 'keystone_admin_token',
keystone_db_password => 'keystone_db_password',
glance_user_password => 'glance_user_password',
glance_db_password => 'glance_db_password',
nova_db_password => 'nova_db_password',
nova_user_password => 'nova_user_password',
rabbit_password => 'rabbit_password',
rabbit_user => 'rabbit_user',
secret_key => '12345',
quantum => false,
}
```
@@ -204,17 +218,21 @@ The `openstack::compute` class deploys the following services:
```puppet
class { 'openstack::compute':
private_interface => 'eth1',
internal_address => $ipaddress_eth0,
internal_address => $::ipaddress_eth0,
libvirt_type => 'kvm',
fixed_range => '10.0.0.0/24',
network_manager => 'nova.network.manager.FlatDHCPManager',
multi_host => false,
sql_connection => 'mysql://nova:nova_db_passwd@192.168.101.10/nova',
rabbit_host => '192.168.101.10',
rabbit_password => 'rabbit_password',
cinder_db_password => 'cinder_db_password',
glance_api_servers => '192.168.101.10:9292',
nova_db_password => 'nova_db_password',
nova_user_password => 'nova_user_password',
vncproxy_host => '192.168.101.10',
vnc_enabled => true,
manage_volumes => true,
quantum => false,
}
```
@@ -357,9 +375,7 @@ class { 'openstack::auth_file':
4. Ensure that the test script has been deployed to the node.
```puppet
file { '/tmp/test_nova.sh':
source => 'puppet:///modules/openstack/nova_test.sh',
}
include openstack::test_file
```
5. Run the test script.

2
manifests/compute.pp
View File

@@ -13,7 +13,7 @@
#
# === Examples
#
# class { 'openstack::nova::compute':
# class { 'openstack::compute':
# internal_address => '192.168.2.2',
# vncproxy_host => '192.168.1.1',
# nova_user_password => 'changeme',

19
tests/all.pp
View File

@@ -1,15 +1,20 @@
class { 'openstack::all':
public_address => $::ipaddress_eth0,
mysql_root_password => 'password',
rabbit_password => 'password',
keystone_db_password => 'password',
keystone_admin_token => '12345',
admin_email => 'root@localhost',
admin_password => 'password',
nova_db_password => 'password',
nova_user_password => 'password',
cinder_db_password => 'password',
cinder_user_password => 'password',
glance_db_password => 'password',
glance_user_password => 'password',
keystone_admin_token => '12345',
keystone_db_password => 'password',
libvirt_type => 'qemu',
mysql_root_password => 'password',
nova_db_password => 'password',
nova_user_password => 'password',
private_interface => 'eth1',
public_address => $::ipaddress_eth0,
public_interface => 'eth0',
quantum => false,
rabbit_password => 'password',
secret_key => '12345',
}

5
tests/auth_file.pp Normal file
View File

@@ -0,0 +1,5 @@
class { 'openstack::auth_file':
admin_password => 'password',
keystone_admin_token => '12345',
controller_node => '127.0.0.1',
}

22
tests/cloudcontroller.pp
View File

@@ -1,16 +1,20 @@
class { 'openstack::controller':
public_address => $::ipaddress_eth0,
mysql_root_password => 'password',
allowed_hosts => ['127.0.0.%', '192.168.1.%'],
rabbit_password => 'password',
keystone_db_password => 'password',
keystone_admin_token => '12345',
admin_email => 'root@localhost',
admin_password => 'password',
nova_db_password => 'password',
nova_user_password => 'password',
allowed_hosts => ['127.0.0.%', '192.168.1.%'],
cinder_db_password => 'password',
cinder_user_password => 'password',
glance_db_password => 'password',
glance_user_password => 'password',
keystone_admin_token => '12345',
keystone_db_password => 'password',
mysql_root_password => 'password',
nova_db_password => 'password',
nova_user_password => 'password',
private_interface => 'eth1',
public_address => $::ipaddress_eth0,
public_interface => 'eth0',
quantum => false,
rabbit_password => 'password',
secret_key => '12345',
exported_resources => false,
}

12
tests/compute.pp
View File

@@ -1,10 +1,12 @@
class { 'openstack::nova::compute':
exported_resources => false,
sql_connection => 'mysql://foo:bar@192.168.1.1/nova',
class { 'openstack::compute':
cinder_db_password => 'password',
fixed_range => '192.168.101.64/28',
glance_api_servers => '192.168.1.1:9292',
internal_address => $::ipaddress_eth1,
rabbit_password => 'password',
nova_user_password => 'password',
libvirt_type => 'qemu',
nova_db_password => 'password',
nova_user_password => 'password',
quantum => false,
rabbit_password => 'password',
vncproxy_host => '192.168.1.1',
}

17
tests/site.pp
View File

@@ -22,6 +22,8 @@ $private_interface = 'eth1'
# credentials
$admin_email = 'root@localhost'
$admin_password = 'keystone_admin'
$cinder_user_password = 'cinder_pass'
$cinder_db_password = 'cinder_pass'
$keystone_db_password = 'keystone_db_pass'
$keystone_admin_token = 'keystone_admin_token'
$nova_db_password = 'nova_pass'
@@ -32,6 +34,7 @@ $rabbit_password = 'openstack_rabbit_password'
$rabbit_user = 'openstack_rabbit_user'
$fixed_network_range = '10.0.0.0/24'
$floating_network_range = '192.168.101.64/28'
$secret_key = 'secret_key'
# switch this to true to have all service log at verbose
$verbose = false
# by default it does not enable atomatically adding floating IPs
@@ -52,6 +55,8 @@ node /openstack_all/ {
private_interface => $private_interface,
admin_email => $admin_email,
admin_password => $admin_password,
cinder_db_password => $cinder_db_password,
cinder_user_password => $cinder_user_password,
keystone_db_password => $keystone_db_password,
keystone_admin_token => $keystone_admin_token,
nova_db_password => $nova_db_password,
@@ -65,6 +70,8 @@ node /openstack_all/ {
fixed_range => $fixed_network_range,
verbose => $verbose,
auto_assign_floating_ip => $auto_assign_floating_ip,
secret_key => $secret_key,
quantum => false,
}
class { 'openstack::auth_file':
@@ -81,7 +88,6 @@ $controller_node_address = '192.168.101.11'
$controller_node_public = $controller_node_address
$controller_node_internal = $controller_node_address
$sql_connection = "mysql://nova:${nova_db_password}@${controller_node_internal}/nova"
node /openstack_controller/ {
@@ -107,13 +113,16 @@ node /openstack_controller/ {
admin_password => $admin_password,
keystone_db_password => $keystone_db_password,
keystone_admin_token => $keystone_admin_token,
cinder_db_password => $cinder_db_password,
cinder_user_password => $cinder_user_password,
glance_db_password => $glance_db_password,
glance_user_password => $glance_user_password,
quantum => false,
nova_db_password => $nova_db_password,
nova_user_password => $nova_user_password,
rabbit_password => $rabbit_password,
rabbit_user => $rabbit_user,
export_resources => false,
secret_key => $secret_key,
}
class { 'openstack::auth_file':
@@ -135,8 +144,10 @@ node /openstack_compute/ {
fixed_range => $fixed_network_range,
network_manager => 'nova.network.manager.FlatDHCPManager',
multi_host => true,
sql_connection => $sql_connection,
cinder_db_password => $cinder_db_password,
nova_db_password => $nova_db_password,
nova_user_password => $nova_user_password,
quantum => false,
rabbit_host => $controller_node_internal,
rabbit_password => $rabbit_password,
rabbit_user => $rabbit_user,

1
tests/testfile.pp Normal file
View File

@@ -0,0 +1 @@
include openstack::test_file