Ryan Lane has submitted this change and it was merged.
Change subject: Several minor changes to the openstack manifest (take two):
......................................................................
Several minor changes to the openstack manifest (take two):
- Use generic::mysql::packages::server rather than locally defining
the mysql-server package.
- Use generic::mysql::packages::client rather than locally defining
the mysql-client package.
- Use webserver:php5 rather than locally gathering up all
the packages we would need for equivalent functionality.
- Add "if !defined" wrappers around several declarations in
order to prevent conflicts with mediawiki_singlenode
- Make sure /a gets created before we try to use /a/backup
Change-Id: I4416a50a22cad35b852e39903cd8f7b2ceee37ae
---
M manifests/openstack.pp
1 file changed, 30 insertions(+), 21 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index ba32a0c..c601efb 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -151,10 +151,12 @@
require => Class["openstack::repo"];
}
- package { [ "unzip", "vblade-persist", "python-mysqldb",
"bridge-utils", "ebtables", "mysql-client", "mysql-common" ]:
+ package { [ "unzip", "vblade-persist", "python-mysqldb",
"bridge-utils", "ebtables", "mysql-common" ]:
ensure => present,
require => Class["openstack::repo"];
}
+
+ require generic::mysql::packages::client,
generic::mysql::packages::server
# For IPv6 support
package { [ "python-netaddr", "radvd" ]:
@@ -330,14 +332,12 @@
$keystone_db_user = $keystoneconfig["db_user"]
$keystone_db_pass = $keystoneconfig["db_pass"]
- package { "mysql-server":
- ensure => present;
- }
-
- service { "mysql":
- enable => true,
- require => Package["mysql-server"],
- ensure => running;
+ if !defined(Service['mysql']) {
+ service { "mysql":
+ enable => true,
+ require => Class['generic::mysql::packages::server'],
+ ensure => running;
+ }
}
# TODO: This expects the services to be installed in the same location
@@ -345,34 +345,34 @@
'set_root':
onlyif => "/usr/bin/mysql -uroot --password=''",
command => "/usr/bin/mysql -uroot --password='' mysql <
/etc/nova/mysql.sql",
- require =>
[Package["mysql-client"],File["/etc/nova/mysql.sql"]],
+ require => [Class["generic::mysql::packages::client"],
File["/etc/nova/mysql.sql"]],
before => Exec['create_nova_db'];
'create_nova_db_user':
unless => "/usr/bin/mysql
--defaults-file=/etc/nova/nova-user.cnf -e 'exit'",
command => "/usr/bin/mysql -uroot <
/etc/nova/nova-user.sql",
- require =>
[Package["mysql-client"],File["/etc/nova/nova-user.sql",
"/etc/nova/nova-user.cnf", "/root/.my.cnf"]];
+ require => [Class["generic::mysql::packages::client"],
File["/etc/nova/nova-user.sql", "/etc/nova/nova-user.cnf", "/root/.my.cnf"]];
'create_nova_db':
unless => "/usr/bin/mysql -uroot $nova_db_name -e
'exit'",
command => "/usr/bin/mysql -uroot -e \"create database
$nova_db_name;\"",
- require => [Package["mysql-client"],
File["/root/.my.cnf"]],
+ require => [Class["generic::mysql::packages::client"],
File["/root/.my.cnf"]],
before => Exec['create_nova_db_user'];
'create_puppet_db_user':
unless => "/usr/bin/mysql
--defaults-file=/etc/puppet/puppet-user.cnf -e 'exit'",
command => "/usr/bin/mysql -uroot <
/etc/puppet/puppet-user.sql",
- require =>
[Package["mysql-client"],File["/etc/puppet/puppet-user.sql",
"/etc/puppet/puppet-user.cnf", "/root/.my.cnf"]];
+ require => [Class["generic::mysql::packages::client"],
File["/etc/puppet/puppet-user.sql", "/etc/puppet/puppet-user.cnf",
"/root/.my.cnf"]];
'create_puppet_db':
unless => "/usr/bin/mysql -uroot $puppet_db_name -e
'exit'",
command => "/usr/bin/mysql -uroot -e \"create database
$puppet_db_name;\"",
- require => [Package["mysql-client"],
File["/root/.my.cnf"]],
+ require => [Class["generic::mysql::packages::client"],
File["/root/.my.cnf"]],
before => Exec['create_puppet_db_user'];
'create_glance_db_user':
unless => "/usr/bin/mysql
--defaults-file=/etc/glance/glance-user.cnf -e 'exit'",
command => "/usr/bin/mysql -uroot <
/etc/glance/glance-user.sql",
- require => [Package['mysql-client'],
File["/etc/glance/glance-user.sql","/etc/glance/glance-user.cnf","/root/.my.cnf"]];
+ require => [Class['generic::mysql::packages::client'],
File["/etc/glance/glance-user.sql","/etc/glance/glance-user.cnf","/root/.my.cnf"]];
'create_glance_db':
unless => "/usr/bin/mysql -uroot $glance_db_name -e
'exit'",
command => "/usr/bin/mysql -uroot -e \"create database
$glance_db_name;\"",
- require => [Package['mysql-client'],
File["/root/.my.cnf"]],
+ require => [Class['generic::mysql::packages::client'],
File["/root/.my.cnf"]],
before => Exec['create_glance_db_user'];
}
@@ -380,11 +380,11 @@
'create_keystone_db_user':
unless => "/usr/bin/mysql
--defaults-file=/etc/keystone/keystone-user.cnf -e 'exit'",
command => "/usr/bin/mysql -uroot <
/etc/keystone/keystone-user.sql",
- require =>
[Package["mysql-client"],File["/etc/keystone/keystone-user.sql",
"/etc/keystone/keystone-user.cnf", "/root/.my.cnf"]];
+ require => [Class["generic::mysql::packages::client"],
File["/etc/keystone/keystone-user.sql", "/etc/keystone/keystone-user.cnf",
"/root/.my.cnf"]];
'create_keystone_db':
unless => "/usr/bin/mysql -uroot $keystone_db_name -e
'exit'",
command => "/usr/bin/mysql -uroot -e \"create database
$keystone_db_name;\"",
- require => [Package["mysql-client"],
File["/root/.my.cnf"]],
+ require => [Class["generic::mysql::packages::client"],
File["/root/.my.cnf"]],
before => Exec['create_keystone_db_user'];
}
@@ -456,10 +456,14 @@
class openstack::openstack-manager($openstack_version="essex", $novaconfig,
$certificate) {
require mediawiki::users::mwdeploy
- include webserver::apache2
+ if !defined(Class["webserver::php5"]) {
+ class {'webserver::php5': ssl => 'true'; }
+ }
- class { "memcached":
- pin => true;
+ if !defined(Class["memcached"]) {
+ class { "memcached":
+ pin => true;
+ }
}
$controller_hostname = $novaconfig["controller_hostname"]
@@ -476,6 +480,11 @@
group => root,
content =>
template('apache/sites/wikitech.wikimedia.org.erb'),
ensure => present;
+ "/a":
+ mode => 755,
+ owner => root,
+ group => root,
+ ensure => directory;
"/a/backup":
mode => 755,
owner => root,
--
To view, visit https://gerrit.wikimedia.org/r/65327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4416a50a22cad35b852e39903cd8f7b2ceee37ae
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
