From 0915572da02bc21c322b86091f1272b4c8cd5ba1 Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
Date: Thu, 5 Jan 2017 15:56:19 -0500
Subject: [PATCH] Move cloud-config.json to cloud-config-novajoin.json

Change-Id: I042392b816cc2b82b98162153fb145f5a6399310
---
 README.md                                               | 2 +-
 files/{cloud-config.json => cloud-config-novajoin.json} | 0
 scripts/novajoin-install                                | 9 +--------
 setup.cfg                                               | 4 ++--
 4 files changed, 4 insertions(+), 11 deletions(-)
 rename files/{cloud-config.json => cloud-config-novajoin.json} (100%)

diff --git a/README.md b/README.md
index bc5e18e..68e7d41 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ vendordata_providers = StaticJSON, DynamicJSON
 vendordata_dynamic_targets = 'join@http://127.0.0.1:9999/v1/'
 vendordata_dynamic_connect_timeout = 5
 vendordata_dynamic_read_timeout = 30
-vendordata_jsonfile_path = /etc/nova/cloud-config.json
+vendordata_jsonfile_path = /etc/nova/cloud-config-novajoin.json
 
 notification_driver = messaging
 notification_topic = notifications
diff --git a/files/cloud-config.json b/files/cloud-config-novajoin.json
similarity index 100%
rename from files/cloud-config.json
rename to files/cloud-config-novajoin.json
diff --git a/scripts/novajoin-install b/scripts/novajoin-install
index 435d070..7a16ad6 100755
--- a/scripts/novajoin-install
+++ b/scripts/novajoin-install
@@ -117,18 +117,11 @@ def install(opts):
     with open(JOINCONF, 'w') as f:
         config.write(f)
 
-    FILES = ['cloud-config.json']
-    for fn in FILES:
-        dst = os.path.join(NOVADIR, fn)
-        source = os.path.join(DATADIR, fn)
-        logger.info('Installing %s' % dst)
-        shutil.copyfile(source, dst)
-
     config = SafeConfigParser()
     config.read(NOVACONF)
     config.set('DEFAULT',
                'vendordata_jsonfile_path',
-               '/etc/nova/cloud-config.json')
+               '/etc/nova/cloud-config-novajoin.json')
 
     # set the default domain to the IPA domain. This is added to the
     # instance name to set the hostname.
diff --git a/setup.cfg b/setup.cfg
index 797c437..96ce723 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,9 +26,9 @@ setup-hooks =
 [files]
 data_files =
     /usr/share/novajoin =
-        files/cloud-config.json
+        files/cloud-config-novajoin.json
         files/freeipa.json
-        files/join.conf.template
+        files/join.conf
     /etc/nova = files/join-api-paste.ini
     /usr/sbin =
         scripts/novajoin-notify