Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/296933
Change subject: mysql: fix spec ...................................................................... mysql: fix spec service_ensure -> ensure_service. Function is from wmflib and has been renamed at some point. It is apparently not an issue unless one has the service managed by puppet. Add wmflib/stdlib to .fixtures.yml The tests are all broken... Maybe we will want to abandon this module specs and revisit later. Bug: T78342 Change-Id: I4f4226e9a16b7bbffdaa4e49f1fa38a93aad4da5 --- A modules/mysql/.fixtures.yml M modules/mysql/manifests/server.pp M modules/mysql/spec/defines/mysql_server_config_spec.rb 3 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/33/296933/1 diff --git a/modules/mysql/.fixtures.yml b/modules/mysql/.fixtures.yml new file mode 100644 index 0000000..6d9a7ba --- /dev/null +++ b/modules/mysql/.fixtures.yml @@ -0,0 +1,6 @@ +fixtures: + symlinks: + mysql: "#{source_dir}" + apparmor: "../../../../apparmor" + stdlib: "../../../../stdlib" + wmflib: "../../../../wmflib" diff --git a/modules/mysql/manifests/server.pp b/modules/mysql/manifests/server.pp index 829f170..f700489 100644 --- a/modules/mysql/manifests/server.pp +++ b/modules/mysql/manifests/server.pp @@ -40,7 +40,7 @@ if $manage_service { service { 'mysqld': - ensure => service_ensure($enabled), + ensure => ensure_service($enabled), name => $service_name, enable => $enabled, require => Package['mysql-server'], diff --git a/modules/mysql/spec/defines/mysql_server_config_spec.rb b/modules/mysql/spec/defines/mysql_server_config_spec.rb index 8369830..1956a76 100644 --- a/modules/mysql/spec/defines/mysql_server_config_spec.rb +++ b/modules/mysql/spec/defines/mysql_server_config_spec.rb @@ -19,7 +19,7 @@ } it 'should contain config parameter in content' do - should contain_file(filename).with_content("### MANAGED BY PUPPET ###\n[mysqld]\nbind-address = 0.0.0.0\n\n") + should contain_file(filename).with_content("# Note: This file is managed by Puppet.\n[mysqld]\nbind-address = 0.0.0.0\n\n") end it 'should not notify the mysql daemon' do -- To view, visit https://gerrit.wikimedia.org/r/296933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f4226e9a16b7bbffdaa4e49f1fa38a93aad4da5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <has...@free.fr> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits