Treat php-fpm as an upstart service on 14.04

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index c8356949a2fc35894a718b90af0dd60d41efc30a..13274b8ff074c7f58400da4467a93c393c6c5df9 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -4,7 +4,8 @@ description "Master role applied to norbert"
 default_attributes(
   :accounts => {
     :users => {
-      :yellowbkpk => { :status => :administrator }
+      :yellowbkpk => { :status => :administrator },
+      :pnorman => { :status => :user }
     }
   },
   :exim => {
@@ -19,12 +20,6 @@ default_attributes(
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.5"
-      },
-      :external_ipv4 => {
-        :interface => "eth1",
-        :role => :external,
-        :family => :inet,
-        :address => "128.40.168.100"
       }
     }
   },