From 9e275a0731aa37a47da6ca2db7ec7a4e965254c6 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sun, 22 Sep 2013 01:53:12 +0000
Subject: [PATCH] Fix dependencies for activity-dev

* modules/openstack_project/manifests/activity_dev.pp: Add missing
parent directory and replace incorrect dependency on a non-puppeted
www-data user account with one on the apache2 package instead.

Change-Id: Ie1dceb9c5d83ed11f9aa9aebd2a18d2ee91b44af
---
 modules/openstack_project/manifests/activity_dev.pp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/manifests/activity_dev.pp b/modules/openstack_project/manifests/activity_dev.pp
index bb6db709c0..6eadd817f9 100644
--- a/modules/openstack_project/manifests/activity_dev.pp
+++ b/modules/openstack_project/manifests/activity_dev.pp
@@ -39,7 +39,18 @@ class openstack_project::activity_dev (
     ensure  => directory,
     owner   => 'www-data',
     group   => 'www-data',
-    require => User['www-data'],
+    mode    => '0775',
+    require => [
+      File['/srv/static'],
+      Package['apache2'],
+    ]
+  }
+
+  file { '/srv/static':
+    ensure  => directory,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0755',
   }
 
 }