From 5f51ee48243a412e1051c863eeb13ce1a49e6f0d Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 20 Oct 2011 10:17:01 -0500 Subject: [PATCH] Catch up with devstack. Hardcode mysql password for simplicity. Update params for new version of devstack. Change-Id: I5390004fdf5859e8ccb895274ab03e86f769164e --- modules/jenkins_slave/files/localrc | 7 +++++++ modules/jenkins_slave/manifests/devstackrepo.pp | 5 +---- modules/jenkins_slave/templates/localrc.erb | 5 ----- modules/orchestra/files/openstack_mysql_password | 1 + modules/orchestra/manifests/init.pp | 4 +--- modules/orchestra/templates/openstack_mysql_password.erb | 1 - 6 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 modules/jenkins_slave/files/localrc delete mode 100644 modules/jenkins_slave/templates/localrc.erb create mode 100644 modules/orchestra/files/openstack_mysql_password delete mode 100644 modules/orchestra/templates/openstack_mysql_password.erb diff --git a/modules/jenkins_slave/files/localrc b/modules/jenkins_slave/files/localrc new file mode 100644 index 0000000000..336af7cb70 --- /dev/null +++ b/modules/jenkins_slave/files/localrc @@ -0,0 +1,7 @@ +# This file is managed by puppet. + +MYSQL_PASSWORD=secret +RABBIT_PASSWORD=secret +ADMIN_PASSWORD=secret +SERVICE_TOKEN=111222333444 +ROOTSLEEP=0 diff --git a/modules/jenkins_slave/manifests/devstackrepo.pp b/modules/jenkins_slave/manifests/devstackrepo.pp index c1b3713aed..befab5f050 100644 --- a/modules/jenkins_slave/manifests/devstackrepo.pp +++ b/modules/jenkins_slave/manifests/devstackrepo.pp @@ -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"], ] diff --git a/modules/jenkins_slave/templates/localrc.erb b/modules/jenkins_slave/templates/localrc.erb deleted file mode 100644 index ef0b11d280..0000000000 --- a/modules/jenkins_slave/templates/localrc.erb +++ /dev/null @@ -1,5 +0,0 @@ -# This file is managed by puppet. - -MYSQL_PASS=<%= mysql_pass -%> -RABBIT_PASSWORD=secret -ADMIN_PASSWORD=secret \ No newline at end of file diff --git a/modules/orchestra/files/openstack_mysql_password b/modules/orchestra/files/openstack_mysql_password new file mode 100644 index 0000000000..d97c5eada5 --- /dev/null +++ b/modules/orchestra/files/openstack_mysql_password @@ -0,0 +1 @@ +secret diff --git a/modules/orchestra/manifests/init.pp b/modules/orchestra/manifests/init.pp index 6b4a007432..68019f4064 100644 --- a/modules/orchestra/manifests/init.pp +++ b/modules/orchestra/manifests/init.pp @@ -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', diff --git a/modules/orchestra/templates/openstack_mysql_password.erb b/modules/orchestra/templates/openstack_mysql_password.erb deleted file mode 100644 index 74e0472ccd..0000000000 --- a/modules/orchestra/templates/openstack_mysql_password.erb +++ /dev/null @@ -1 +0,0 @@ -<%= mysql_pass -%>