Catch up with devstack.
Hardcode mysql password for simplicity. Update params for new version of devstack. Change-Id: I5390004fdf5859e8ccb895274ab03e86f769164e
This commit is contained in:
parent
67bcce274f
commit
5f51ee4824
7
modules/jenkins_slave/files/localrc
Normal file
7
modules/jenkins_slave/files/localrc
Normal 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
|
@ -1,7 +1,5 @@
|
||||
define devstackrepo($ensure = present) {
|
||||
$repo_there = "test -d /home/jenkins/devstack"
|
||||
$mysql_pass = $orchestra::mysql_pass
|
||||
$rabbit_pass = generate('/usr/bin/openssl', 'rand', '-hex', '12')
|
||||
case $ensure {
|
||||
present: {
|
||||
exec { "Clone devstack git repo":
|
||||
@ -18,8 +16,7 @@ define devstackrepo($ensure = present) {
|
||||
group => 'root',
|
||||
mode => 444,
|
||||
ensure => 'present',
|
||||
content => template('jenkins_slave/localrc.erb'),
|
||||
replace => 'false',
|
||||
source => 'puppet:///modules/jenkins_slave/localrc',
|
||||
require => [Exec["Clone devstack git repo"],
|
||||
File["/var/lib/cobbler/snippets/openstack_mysql_password"],
|
||||
]
|
||||
|
@ -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
1
modules/orchestra/files/openstack_mysql_password
Normal file
@ -0,0 +1 @@
|
||||
secret
|
@ -1,5 +1,4 @@
|
||||
class orchestra {
|
||||
$mysql_pass = generate('/usr/bin/openssl', 'rand', '-hex', '12')
|
||||
package { ipmitool: ensure => present }
|
||||
package { ubuntu-orchestra-server: ensure => present }
|
||||
exec { cobbler-sync:
|
||||
@ -28,8 +27,7 @@ class orchestra {
|
||||
group => 'root',
|
||||
mode => 444,
|
||||
ensure => 'present',
|
||||
content => template('orchestra/openstack_mysql_password.erb'),
|
||||
replace => 'false',
|
||||
source => 'puppet:///modules/orchestra/openstack_mysql_password',
|
||||
}
|
||||
file { "/etc/cobbler/dnsmasq.template":
|
||||
owner => 'root',
|
||||
|
@ -1 +0,0 @@
|
||||
<%= mysql_pass -%>
|
Loading…
x
Reference in New Issue
Block a user