opendev/system-config
Code Issues Proposed changes

Catch up with devstack.

Browse Source 
Hardcode mysql password for simplicity.
Update params for new version of devstack.

Change-Id: I5390004fdf5859e8ccb895274ab03e86f769164e
This commit is contained in:
James E. Blair 2011-10-20 10:17:01 -05:00
parent 67bcce274f
commit 5f51ee4824
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/jenkins_slave/files/localrc Normal file
View File

@ -0,0 +1,7 @@
# This file is managed by puppet.
MYSQL_PASSWORD=secret
RABBIT_PASSWORD=secret
ADMIN_PASSWORD=secret
SERVICE_TOKEN=111222333444
ROOTSLEEP=0

5
modules/jenkins_slave/manifests/devstackrepo.pp
View File

@ -1,7 +1,5 @@
define devstackrepo($ensure = present) { define devstackrepo($ensure = present) {
$repo_there = "test -d /home/jenkins/devstack" $repo_there = "test -d /home/jenkins/devstack"
$mysql_pass = $orchestra::mysql_pass
$rabbit_pass = generate('/usr/bin/openssl', 'rand', '-hex', '12')
case $ensure { case $ensure {
present: { present: {
exec { "Clone devstack git repo": exec { "Clone devstack git repo":
@ -18,8 +16,7 @@ define devstackrepo($ensure = present) {
group => 'root', group => 'root',
mode => 444, mode => 444,
ensure => 'present', ensure => 'present',
content => template('jenkins_slave/localrc.erb'), source => 'puppet:///modules/jenkins_slave/localrc',
replace => 'false',
require => [Exec["Clone devstack git repo"], require => [Exec["Clone devstack git repo"],
File["/var/lib/cobbler/snippets/openstack_mysql_password"], File["/var/lib/cobbler/snippets/openstack_mysql_password"],
] ]

5
modules/jenkins_slave/templates/localrc.erb
View File

@ -1,5 +0,0 @@
# This file is managed by puppet.
MYSQL_PASS=<%= mysql_pass -%>
RABBIT_PASSWORD=secret
ADMIN_PASSWORD=secret

1
modules/orchestra/files/openstack_mysql_password Normal file
View File

@ -0,0 +1 @@
secret

4
modules/orchestra/manifests/init.pp
View File

@ -1,5 +1,4 @@
class orchestra { class orchestra {
$mysql_pass = generate('/usr/bin/openssl', 'rand', '-hex', '12')
package { ipmitool: ensure => present } package { ipmitool: ensure => present }
package { ubuntu-orchestra-server: ensure => present } package { ubuntu-orchestra-server: ensure => present }
exec { cobbler-sync: exec { cobbler-sync:
@ -28,8 +27,7 @@ class orchestra {
group => 'root', group => 'root',
mode => 444, mode => 444,
ensure => 'present', ensure => 'present',
content => template('orchestra/openstack_mysql_password.erb'), source => 'puppet:///modules/orchestra/openstack_mysql_password',
replace => 'false',
} }
file { "/etc/cobbler/dnsmasq.template": file { "/etc/cobbler/dnsmasq.template":
owner => 'root', owner => 'root',

1
modules/orchestra/templates/openstack_mysql_password.erb
View File

@ -1 +0,0 @@
<%= mysql_pass -%>