From d0df360e5dd21203c70939678e86fd66fb8f84c0 Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Mon, 12 Aug 2013 16:45:39 -0500
Subject: [PATCH] Removed template refs, quoted log_datefmt_logfile

---
 salt/files/master |  2 +-
 salt/master.sls   | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/salt/files/master b/salt/files/master
index 01ec49c..de4ea89 100644
--- a/salt/files/master
+++ b/salt/files/master
@@ -488,7 +488,7 @@ log_level_logfile: {{ salt.get('log_level_logfile', 'warning') }}
 # The date and time format used in log messages. Allowed date/time formating
 # can be seen here: http://docs.python.org/library/time.html#time.strftime
 #log_datefmt: '%H:%M:%S'
-log_datefmt_logfile: {{ salt.get('log_datefmt_logfile', '%Y-%m-%d %H:%M:%S') }}
+log_datefmt_logfile: '{{ salt.get('log_datefmt_logfile', '%Y-%m-%d %H:%M:%S') }}'
 
 # The format of the console logging messages. Allowed formatting options can
 # be seen here: http://docs.python.org/library/logging.html#logrecord-attributes
diff --git a/salt/master.sls b/salt/master.sls
index bcb404d..7b71c88 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -15,26 +15,3 @@ salt-master:
       - pkg: salt-minion
     - watch:
       - file: salt-minion
-
-configure-salt-master:
-  file.managed:
-    - name: /etc/salt/master
-    - source: salt://salt/templates/master.template
-    - template: jinja
-    - user: root
-    - groupt: root
-    - mode: 0700
-
-run-salt-master:
-  cmd.wait:
-    - name: start salt-master
-    - watch:
-      - file: run-salt-master
-    - require:
-      - file: configure-salt-master
-  file.managed:
-    - name: /etc/init/salt-master
-    - source: salt://salt/templates/upstart-master.conf
-    - template: jinja
-    - defaults:
-        run_mode: master