From c598f366eca4ad9da06e4e205e7c0ddbd0bf4ab0 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Tue, 19 Jan 2016 13:20:14 -0800
Subject: [PATCH] Drop orchestrator.ini.sample from git

This drops tracking of the generated sample from git, since the output
of generation is non-deterministic, we end up with big changes to this
file anytime someone proposes a change that requires a new sample.

Instead, lets track orchestrator.ini and update it at milestone/release
times.

Also, have the devstack plugin generate and use a sample, that way we
get some gate testing on proposed config changes.

Change-Id: Iaf5127733765e973dbf0e812f267a3304c575fd4
Closes-bug: #1535889
---
 .gitignore                                        | 1 +
 devstack/plugin.sh                                | 1 +
 etc/{orchestrator.ini.sample => orchestrator.ini} | 0
 3 files changed, 2 insertions(+)
 rename etc/{orchestrator.ini.sample => orchestrator.ini} (100%)

diff --git a/.gitignore b/.gitignore
index 684febf0..be65d63f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ pip-log.txt
 AUTHORS
 ChangeLog
 
+orchestrator.ini.sample
 test.conf
 
 *.swp
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index cb6cc309..55043adc 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -72,6 +72,7 @@ function configure_astara() {
     sudo cp $ASTARA_DIR/etc/rootwrap.conf $ASTARA_CONF_DIR
     sudo cp $ASTARA_DIR/etc/rootwrap.d/* $ASTARA_CONF_DIR/rootwrap.d/
 
+    (cd $ASTARA_DIR ;exec tools/generate_config_file_samples.sh)
     cp $ASTARA_DIR/etc/orchestrator.ini.sample $ASTARA_CONF
     cp $ASTARA_DIR/etc/provider_rules.json $ASTARA_PROVIDER_RULE_CONF
     iniset $ASTARA_CONF DEFAULT debug True
diff --git a/etc/orchestrator.ini.sample b/etc/orchestrator.ini
similarity index 100%
rename from etc/orchestrator.ini.sample
rename to etc/orchestrator.ini