Skip to content

Commit

Permalink
Merge pull request redhat-openstack#13 from razorinc/heat_support
Browse files Browse the repository at this point in the history
Create Heat DB and Keystone user, generate passwords
  • Loading branch information
gildub committed Sep 30, 2013
2 parents e946a1e + 2d1c402 commit f3078de
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 0 deletions.
2 changes: 2 additions & 0 deletions bin/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@
"cinder_user_password" => SecureRandom.hex,
"glance_db_password" => SecureRandom.hex,
"glance_user_password" => SecureRandom.hex,
"heat_db_password" => SecureRandom.hex,
"heat_user_password" => SecureRandom.hex,
"horizon_secret_key" => SecureRandom.hex,
"keystone_admin_token" => SecureRandom.hex,
"keystone_db_password" => SecureRandom.hex,
Expand Down
37 changes: 37 additions & 0 deletions puppet/modules/quickstack/manifests/neutron/controller.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
$admin_password = $quickstack::params::admin_password,
$ceilometer_metering_secret = $quickstack::params::ceilometer_metering_secret,
$ceilometer_user_password = $quickstack::params::ceilometer_user_password,
$heat_user_password = $quickstack::params::heat_user_password,
$heat_db_password = $quickstack::params::heat_db_password,
$cinder_db_password = $quickstack::params::cinder_db_password,
$cinder_user_password = $quickstack::params::cinder_user_password,
$glance_db_password = $quickstack::params::glance_db_password,
Expand Down Expand Up @@ -74,6 +76,14 @@
internal_address => $controller_priv_floating_ip,
}

class {"heat::keystone::auth":
password => $heat_user_password,
heat_public_address => $controller_priv_floating_ip,
heat_admin_address => $controller_priv_floating_ip,
heat_internal_address => $controller_priv_floating_ip,
cfn_auth_name => undef,
}

class {'openstack::glance':
db_host => $controller_priv_floating_ip,
user_password => $glance_user_password,
Expand Down Expand Up @@ -151,6 +161,33 @@
require => Class['mongodb'],
}

class { 'heat':
keystone_host => $controller_priv_floating_ip,
keystone_password => $heat_user_password,
auth_uri => "https://${controller_priv_floating_ip}:35357/v2.0",
rpc_backend => 'heat.openstack.common.rpc.impl_qpid',
qpid_hostname => $controller_priv_floating_ip,
verbose => $verbose,
}

class {'heat::db::mysql':
password => $heat_db_password,
allowed_hosts => "%%",
}

class {'heat::db':
sql_connection => "mysql:https://heat:${heat_db_password}@${controller_floating_ip}/heat"
}

class {'heat::api':
}

class {'heat::engine':
heat_metadata_server_url => "https://${controller_priv_floating_ip}:8000",
heat_waitcondition_server_url => "https://${controller_priv_floating_ip}:8000/v1/waitcondition",
heat_watch_server_url => "https://${controller_priv_floating_ip}:8003",
}

glance_api_config {
'DEFAULT/notifier_strategy': value => 'qpid'
}
Expand Down
37 changes: 37 additions & 0 deletions puppet/modules/quickstack/manifests/nova_network/controller.pp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
$admin_password = $quickstack::params::admin_password,
$ceilometer_metering_secret = $quickstack::params::ceilometer_metering_secret,
$ceilometer_user_password = $quickstack::params::ceilometer_user_password,
$heat_user_password = $quickstack::params::heat_user_password,
$heat_db_password = $quickstack::params::heat_db_password,
$cinder_db_password = $quickstack::params::cinder_db_password,
$cinder_user_password = $quickstack::params::cinder_user_password,
$glance_db_password = $quickstack::params::glance_db_password,
Expand Down Expand Up @@ -96,6 +98,14 @@
internal_address => $controller_priv_floating_ip,
}

class {"heat::keystone::auth":
password => $heat_user_password,
heat_public_address => $controller_priv_floating_ip,
heat_admin_address => $controller_priv_floating_ip,
heat_internal_address => $controller_priv_floating_ip,
cfn_auth_name => undef,
}

class {'openstack::glance':
db_host => $controller_priv_floating_ip,
user_password => $glance_user_password,
Expand Down Expand Up @@ -136,6 +146,33 @@
require => Class['mongodb'],
}

class { 'heat':
keystone_host => $controller_priv_floating_ip,
keystone_password => $heat_user_password,
auth_uri => "https://${controller_priv_floating_ip}:35357/v2.0",
rpc_backend => 'heat.openstack.common.rpc.impl_qpid',
qpid_hostname => $controller_priv_floating_ip,
verbose => $verbose,
}

class { 'heat::engine':
heat_metadata_server_url => "https://${controller_priv_floating_ip}:8000",
heat_waitcondition_server_url => "https://${controller_priv_floating_ip}:8000/v1/waitcondition",
heat_watch_server_url => "https://${controller_priv_floating_ip}:8003",
}

class { 'heat::db::mysql':
password => $heat_db_password,
allowed_hosts => "%%",
}

class { 'heat::db':
sql_connection => "mysql:https://heat:${heat_db_password}@${controller_priv_floating_ip}/heat",
}

class { 'heat::api':
}

glance_api_config {
'DEFAULT/notifier_strategy': value => 'qpid'
}
Expand Down
2 changes: 2 additions & 0 deletions puppet/modules/quickstack/manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
$admin_password = 'CHANGEME'
$ceilometer_metering_secret = 'CHANGEME'
$ceilometer_user_password = 'CHANGEME'
$heat_user_password = 'CHANGEME'
$heat_db_password = 'CHANGEME'
$cinder_db_password = 'CHANGEME'
$cinder_user_password = 'CHANGEME'
$glance_db_password = 'CHANGEME'
Expand Down

0 comments on commit f3078de

Please sign in to comment.