From 42001f843c79a148ed26d6b5999211fc38877213 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Mon, 13 Apr 2015 14:08:56 +0000
Subject: [PATCH] Move deploy from source template files to templates/git

---
 hooks/neutron_ovs_utils.py                                  | 6 +++---
 templates/{ => git}/neutron_sudoers                         | 0
 templates/{ => git}/upstart/neutron-ovs-cleanup.upstart     | 0
 .../upstart/neutron-plugin-openvswitch-agent.upstart        | 0
 unit_tests/test_neutron_ovs_utils.py                        | 6 +++---
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename templates/{ => git}/neutron_sudoers (100%)
 rename templates/{ => git}/upstart/neutron-ovs-cleanup.upstart (100%)
 rename templates/{ => git}/upstart/neutron-plugin-openvswitch-agent.upstart (100%)

diff --git a/hooks/neutron_ovs_utils.py b/hooks/neutron_ovs_utils.py
index fb9d5dd6..111ccc35 100644
--- a/hooks/neutron_ovs_utils.py
+++ b/hooks/neutron_ovs_utils.py
@@ -268,7 +268,7 @@ def git_post_install(projects_yaml):
     for conf, files in configs.iteritems():
         shutil.copyfile(files['src'], files['dest'])
 
-    render('neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {},
+    render('git/neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {},
            perms=0o440)
 
     neutron_ovs_agent_context = {
@@ -288,10 +288,10 @@ def git_post_install(projects_yaml):
     }
 
     # NOTE(coreycb): Needs systemd support
-    render('upstart/neutron-plugin-openvswitch-agent.upstart',
+    render('git/upstart/neutron-plugin-openvswitch-agent.upstart',
            '/etc/init/neutron-plugin-openvswitch-agent.conf',
            neutron_ovs_agent_context, perms=0o644)
-    render('upstart/neutron-ovs-cleanup.upstart',
+    render('git/upstart/neutron-ovs-cleanup.upstart',
            '/etc/init/neutron-ovs-cleanup.conf',
            neutron_ovs_cleanup_context, perms=0o644)
 
diff --git a/templates/neutron_sudoers b/templates/git/neutron_sudoers
similarity index 100%
rename from templates/neutron_sudoers
rename to templates/git/neutron_sudoers
diff --git a/templates/upstart/neutron-ovs-cleanup.upstart b/templates/git/upstart/neutron-ovs-cleanup.upstart
similarity index 100%
rename from templates/upstart/neutron-ovs-cleanup.upstart
rename to templates/git/upstart/neutron-ovs-cleanup.upstart
diff --git a/templates/upstart/neutron-plugin-openvswitch-agent.upstart b/templates/git/upstart/neutron-plugin-openvswitch-agent.upstart
similarity index 100%
rename from templates/upstart/neutron-plugin-openvswitch-agent.upstart
rename to templates/git/upstart/neutron-plugin-openvswitch-agent.upstart
diff --git a/unit_tests/test_neutron_ovs_utils.py b/unit_tests/test_neutron_ovs_utils.py
index c75d7915..af26a046 100644
--- a/unit_tests/test_neutron_ovs_utils.py
+++ b/unit_tests/test_neutron_ovs_utils.py
@@ -295,12 +295,12 @@ class TestNeutronOVSUtils(CharmTestCase):
             'log_file': '/var/log/neutron/ovs-cleanup.log',
         }
         expected = [
-            call('neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {},
+            call('git/neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {},
                  perms=0o440),
-            call('upstart/neutron-plugin-openvswitch-agent.upstart',
+            call('git/upstart/neutron-plugin-openvswitch-agent.upstart',
                  '/etc/init/neutron-plugin-openvswitch-agent.conf',
                  neutron_ovs_agent_context, perms=0o644),
-            call('upstart/neutron-ovs-cleanup.upstart',
+            call('git/upstart/neutron-ovs-cleanup.upstart',
                  '/etc/init/neutron-ovs-cleanup.conf',
                  neutron_ovs_cleanup_context, perms=0o644),
         ]