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
This commit is contained in:
Adam Gandelman 2016-01-19 13:20:14 -08:00
parent 5744be2c9d
commit c598f366ec
3 changed files with 2 additions and 0 deletions

1
.gitignore vendored
View File

@ -33,6 +33,7 @@ pip-log.txt
AUTHORS
ChangeLog
orchestrator.ini.sample
test.conf
*.swp

View File

@ -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