From 9d4e875570199ae7a25632ed18e7664827d7623c Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Wed, 28 Jan 2015 09:56:03 -0800 Subject: [PATCH] Refactor subversion module away The subversion module was a trivial module, so rather than split it out, just remove the indirection and have the wiki class install the subversion package. Change-Id: Ida58a545aba32bb6df65af677f4b4b93c0152851 --- modules/openstack_project/manifests/wiki.pp | 4 +--- modules/subversion/manifests/init.pp | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 modules/subversion/manifests/init.pp diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp index ad1fabccd9..149dd49379 100644 --- a/modules/openstack_project/manifests/wiki.pp +++ b/modules/openstack_project/manifests/wiki.pp @@ -8,12 +8,10 @@ class openstack_project::wiki ( $ssl_chain_file_contents = '' ) { - package { ['openssl', 'ssl-cert']: + package { ['openssl', 'ssl-cert', 'subversion']: ensure => present; } - include subversion - class { 'openstack_project::server': iptables_public_tcp_ports => [80, 443], sysadmins => $sysadmins, diff --git a/modules/subversion/manifests/init.pp b/modules/subversion/manifests/init.pp deleted file mode 100644 index 3e207ea11e..0000000000 --- a/modules/subversion/manifests/init.pp +++ /dev/null @@ -1,7 +0,0 @@ -class subversion { - package { 'subversion': - ensure => latest, - } -} - -# vim:sw=2:ts=2:expandtab:textwidth=79