From 3aa64eda328fa3f26aafe42d91f1b0773d10b681 Mon Sep 17 00:00:00 2001
From: "Michal (inc0) Jastrzebski" <inc007@gmail.com>
Date: Wed, 12 Apr 2017 23:34:44 +0000
Subject: [PATCH] Finalize move of configs to kolla-k8s

Remove gate workaround and add release notes

Change-Id: Iba69045299b5f68af73e182bd6c928bbc2697ca9
---
 ...ove-confs-to-kolla-k8s-e735bd379b17a494.yaml |  3 +++
 tests/bin/setup_config.sh                       | 17 -----------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 create mode 100644 releasenotes/notes/move-confs-to-kolla-k8s-e735bd379b17a494.yaml

diff --git a/releasenotes/notes/move-confs-to-kolla-k8s-e735bd379b17a494.yaml b/releasenotes/notes/move-confs-to-kolla-k8s-e735bd379b17a494.yaml
new file mode 100644
index 000000000..e7c2e8ad8
--- /dev/null
+++ b/releasenotes/notes/move-confs-to-kolla-k8s-e735bd379b17a494.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Config files are now generated by ansible in kolla-kubernetes
diff --git a/tests/bin/setup_config.sh b/tests/bin/setup_config.sh
index 696f47936..1cf991f3c 100755
--- a/tests/bin/setup_config.sh
+++ b/tests/bin/setup_config.sh
@@ -35,23 +35,6 @@ if [ "x$BRANCH" == "x2" -o "x$BRANCH" == "x3" ]; then
 fi
 
 kolla-ansible/tools/generate_passwords.py
-kolla-ansible/tools/kolla-ansible genconfig
-
-# Testing ansible-in-k8s approach
-rm -rf /etc/kolla/neutron*
-rm -rf /etc/kolla/ceph*
-rm -rf /etc/kolla/keystone*
-rm -rf /etc/kolla/glance*
-rm -rf /etc/kolla/horizon*
-rm -rf /etc/kolla/nova*
-rm -rf /etc/kolla/memcached*
-rm -rf /etc/kolla/cinder*
-rm -rf /etc/kolla/rabbitmq*
-rm -rf /etc/kolla/heat*
-rm -rf /etc/kolla/mariadb*
-rm -rf /etc/kolla/ironic*
-rm -rf /etc/kolla/iscisi*
-rm -rf /etc/kolla/tgtd*
 
 ansible-playbook -e ansible_python_interpreter=/usr/bin/python -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml -e CONFIG_DIR=/etc/kolla ansible/site.yml
 ls -la /etc/kolla