From ff007f29a2d8fe834cb1caa638ee0c848241e65a Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Mon, 6 Oct 2014 16:47:44 -0700 Subject: [PATCH] Removing openssl class Didn't seem worth it to try to split this small of a module out. I could be happy moving it into an openstack_project::openssl class. Change-Id: I36a27c5cddd2c4cbdd95cdcc015e54780fd441ae --- modules/openssl/manifests/init.pp | 12 ------------ modules/openstack_project/manifests/wiki.pp | 5 ++++- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 modules/openssl/manifests/init.pp diff --git a/modules/openssl/manifests/init.pp b/modules/openssl/manifests/init.pp deleted file mode 100644 index 1746de8f1a..0000000000 --- a/modules/openssl/manifests/init.pp +++ /dev/null @@ -1,12 +0,0 @@ -# Class: openssl -# -class openssl { - $packages = [ - 'openssl', - 'ssl-cert', - ] - - package { $packages: - ensure => present; - } -} diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp index 13d4ad8e1d..ad1fabccd9 100644 --- a/modules/openstack_project/manifests/wiki.pp +++ b/modules/openstack_project/manifests/wiki.pp @@ -8,7 +8,10 @@ class openstack_project::wiki ( $ssl_chain_file_contents = '' ) { - include openssl + package { ['openssl', 'ssl-cert']: + ensure => present; + } + include subversion class { 'openstack_project::server':