[PATCH branch-2.1 1/3] Introduce extra_redist_files

[Luca Bigliardi]

Add and propagate user's list of files to be redistributed.

Signed-off-by: Luca Bigliardi <shamm...@google.com>
---
 lib/backend.py   |    1 +
 lib/cmdlib.py    |    1 +
 lib/constants.py |    2 ++
 3 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/lib/backend.py b/lib/backend.py
index af741ff..0b5e76e 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -164,6 +164,7 @@ def _BuildUploadFileList():
     constants.RAPI_CERT_FILE,
     constants.RAPI_USERS_FILE,
     constants.HMAC_CLUSTER_KEY,
+    constants.EXTRA_REDIST,
     ])
 
   for hv_name in constants.HYPER_TYPES:
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index ce2f0b1..5596b0c 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1777,6 +1777,7 @@ def _RedistributeAncillaryFiles(lu, 
additional_nodes=None):
                     constants.RAPI_CERT_FILE,
                     constants.RAPI_USERS_FILE,
                     constants.HMAC_CLUSTER_KEY,
+                    constants.EXTRA_REDIST,
                    ])
 
   enabled_hypervisors = lu.cfg.GetClusterInfo().enabled_hypervisors
diff --git a/lib/constants.py b/lib/constants.py
index 302e0c9..fa9c84d 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -108,6 +108,8 @@ DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
 SYSCONFDIR = _autoconf.SYSCONFDIR
 CONF_DIR = SYSCONFDIR + "/ganeti"
 
+EXTRA_REDIST = CONF_DIR + "/extra_redist_files"
+
 MASTER_SOCKET = SOCKET_DIR + "/ganeti-master"
 
 NODE_INITD_SCRIPT = SYSCONFDIR + "/init.d/ganeti"
-- 
1.5.4.3