From 3ace1ba29e3eaff1100e841bc3904d9843c6b08c Mon Sep 17 00:00:00 2001
From: Clint Byrum <clint@fewbar.com>
Date: Fri, 15 Mar 2013 10:07:07 -0700
Subject: [PATCH] Run os-config-applier using os-refresh-config.

There's no need to run os-config-applier at any time except when
os-refresh-config is in its configure state.

Change-Id: Id9758294c60469a976b61c68fc26d9b83130599a
---
 elements/os-config-applier/element-deps       |  1 +
 .../install.d/10-os-config-applier            | 24 -------------------
 .../os-config-applier/.os-config-applier      |  0
 .../configure.d/50-os-config-applier          |  2 ++
 4 files changed, 3 insertions(+), 24 deletions(-)
 create mode 100644 elements/os-config-applier/element-deps
 create mode 100644 elements/os-config-applier/os-config-applier/.os-config-applier
 create mode 100755 elements/os-config-applier/os-refresh-config/configure.d/50-os-config-applier

diff --git a/elements/os-config-applier/element-deps b/elements/os-config-applier/element-deps
new file mode 100644
index 00000000..33d7e82b
--- /dev/null
+++ b/elements/os-config-applier/element-deps
@@ -0,0 +1 @@
+os-refresh-config
diff --git a/elements/os-config-applier/install.d/10-os-config-applier b/elements/os-config-applier/install.d/10-os-config-applier
index 0e2573a8..586ef491 100755
--- a/elements/os-config-applier/install.d/10-os-config-applier
+++ b/elements/os-config-applier/install.d/10-os-config-applier
@@ -6,27 +6,3 @@ pip install -U git+https://github.com/stackforge/os-config-applier.git
 
 TEMPLATE_ROOT=$(os-config-applier --print-templates)
 mkdir -p $TEMPLATE_ROOT
-
-# Upstart
-if [ -d /etc/init ] ; then
-    cat > /etc/init/os-config-applier.conf <<eof
-start on runlevel [2345]
-task
-exec os-config-applier
-eof
-# Systemd
-elif [ -d /etc/systemd/system ] ; then
-    cat > /etc/systemd/system/os-config-applier.service <<eof
-[Unit]
-Description=Apply configs from Heat metadata
-
-[Service]
-ExecStart=os-config-applier
-
-[Install]
-WantedBy=multi-user.target
-eof
-else
-    echo "Only systems with systemd or upstart are supported."
-    exit 1
-fi
diff --git a/elements/os-config-applier/os-config-applier/.os-config-applier b/elements/os-config-applier/os-config-applier/.os-config-applier
new file mode 100644
index 00000000..e69de29b
diff --git a/elements/os-config-applier/os-refresh-config/configure.d/50-os-config-applier b/elements/os-config-applier/os-refresh-config/configure.d/50-os-config-applier
new file mode 100755
index 00000000..9549501e
--- /dev/null
+++ b/elements/os-config-applier/os-refresh-config/configure.d/50-os-config-applier
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec os-config-applier -s OpenStack::Config