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