Merge compass-tasks-osa and compass-tasks-k8s

JIRA: COMPASS-568

rename compass-tasks to compass-tasks-base.
add both osa and k8s support in compass-tasks

Change-Id: I438f5b17e509d4cb751ced0ffe640ec70899882f
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>

143 files changed, 138 insertions, 113 deletions

diff --git a/compass-tasks-base/Dockerfile b/compass-tasks-base/Dockerfile
new file mode 100644
index 0000000..3beaf57
--- /dev/null
+++ b/compass-tasks-base/Dockerfile
@@ -0,0 +1,12 @@
+FROM centos:7
+
+ADD . /root/compass-tasks
+
+RUN /root/compass-tasks/build.sh
+
+EXPOSE 6379
+
+VOLUME ["/var/ansible", "/etc/compass/machine_list", "/etc/compass/switch_list"]
+
+ENTRYPOINT ["/bin/bash", "-c"]
+CMD ["/usr/local/bin/start.sh"]
diff --git a/compass-tasks/README.md b/compass-tasks-base/README.md
index 952f4b5..952f4b5 100644
--- a/compass-tasks/README.md
+++ b/compass-tasks-base/README.md
diff --git a/compass-tasks/actions/__init__.py b/compass-tasks-base/actions/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/actions/__init__.py
+++ b/compass-tasks-base/actions/__init__.py
diff --git a/compass-tasks/actions/clean.py b/compass-tasks-base/actions/clean.py
index a4e9bc9..a4e9bc9 100644
--- a/compass-tasks/actions/clean.py
+++ b/compass-tasks-base/actions/clean.py
diff --git a/compass-tasks/actions/cli.py b/compass-tasks-base/actions/cli.py
index c9058ed..c9058ed 100644
--- a/compass-tasks/actions/cli.py
+++ b/compass-tasks-base/actions/cli.py
diff --git a/compass-tasks/actions/delete.py b/compass-tasks-base/actions/delete.py
index d89994d..d89994d 100644
--- a/compass-tasks/actions/delete.py
+++ b/compass-tasks-base/actions/delete.py
diff --git a/compass-tasks/actions/deploy.py b/compass-tasks-base/actions/deploy.py
index 53179f5..53179f5 100644
--- a/compass-tasks/actions/deploy.py
+++ b/compass-tasks-base/actions/deploy.py
diff --git a/compass-tasks/actions/health_check/__init__.py b/compass-tasks-base/actions/health_check/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/actions/health_check/__init__.py
+++ b/compass-tasks-base/actions/health_check/__init__.py
diff --git a/compass-tasks/actions/health_check/base.py b/compass-tasks-base/actions/health_check/base.py
index 22b6fae..22b6fae 100644
--- a/compass-tasks/actions/health_check/base.py
+++ b/compass-tasks-base/actions/health_check/base.py
diff --git a/compass-tasks/actions/health_check/check.py b/compass-tasks-base/actions/health_check/check.py
index c1adbc6..c1adbc6 100644
--- a/compass-tasks/actions/health_check/check.py
+++ b/compass-tasks-base/actions/health_check/check.py
diff --git a/compass-tasks/actions/health_check/check_apache.py b/compass-tasks-base/actions/health_check/check_apache.py
index 294d6f9..294d6f9 100644
--- a/compass-tasks/actions/health_check/check_apache.py
+++ b/compass-tasks-base/actions/health_check/check_apache.py
diff --git a/compass-tasks/actions/health_check/check_celery.py b/compass-tasks-base/actions/health_check/check_celery.py
index 2d8d27c..2d8d27c 100644
--- a/compass-tasks/actions/health_check/check_celery.py
+++ b/compass-tasks-base/actions/health_check/check_celery.py
diff --git a/compass-tasks/actions/health_check/check_dhcp.py b/compass-tasks-base/actions/health_check/check_dhcp.py
index e3bae1e..e3bae1e 100644
--- a/compass-tasks/actions/health_check/check_dhcp.py
+++ b/compass-tasks-base/actions/health_check/check_dhcp.py
diff --git a/compass-tasks/actions/health_check/check_dns.py b/compass-tasks-base/actions/health_check/check_dns.py
index 843d7e2..843d7e2 100644
--- a/compass-tasks/actions/health_check/check_dns.py
+++ b/compass-tasks-base/actions/health_check/check_dns.py
diff --git a/compass-tasks/actions/health_check/check_hds.py b/compass-tasks-base/actions/health_check/check_hds.py
index d176f1f..d176f1f 100644
--- a/compass-tasks/actions/health_check/check_hds.py
+++ b/compass-tasks-base/actions/health_check/check_hds.py
diff --git a/compass-tasks/actions/health_check/check_misc.py b/compass-tasks-base/actions/health_check/check_misc.py
index b8beb1b..b8beb1b 100644
--- a/compass-tasks/actions/health_check/check_misc.py
+++ b/compass-tasks-base/actions/health_check/check_misc.py
diff --git a/compass-tasks/actions/health_check/check_os_installer.py b/compass-tasks-base/actions/health_check/check_os_installer.py
index 6ef9818..6ef9818 100644
--- a/compass-tasks/actions/health_check/check_os_installer.py
+++ b/compass-tasks-base/actions/health_check/check_os_installer.py
diff --git a/compass-tasks/actions/health_check/check_package_installer.py b/compass-tasks-base/actions/health_check/check_package_installer.py
index efcd8e8..efcd8e8 100644
--- a/compass-tasks/actions/health_check/check_package_installer.py
+++ b/compass-tasks-base/actions/health_check/check_package_installer.py
diff --git a/compass-tasks/actions/health_check/check_squid.py b/compass-tasks-base/actions/health_check/check_squid.py
index 5628a63..5628a63 100644
--- a/compass-tasks/actions/health_check/check_squid.py
+++ b/compass-tasks-base/actions/health_check/check_squid.py
diff --git a/compass-tasks/actions/health_check/check_tftp.py b/compass-tasks-base/actions/health_check/check_tftp.py
index 7ca6405..7ca6405 100644
--- a/compass-tasks/actions/health_check/check_tftp.py
+++ b/compass-tasks-base/actions/health_check/check_tftp.py
diff --git a/compass-tasks/actions/health_check/utils.py b/compass-tasks-base/actions/health_check/utils.py
index 369c5b6..369c5b6 100644
--- a/compass-tasks/actions/health_check/utils.py
+++ b/compass-tasks-base/actions/health_check/utils.py
diff --git a/compass-tasks/actions/install_callback.py b/compass-tasks-base/actions/install_callback.py
index 14d2639..14d2639 100644
--- a/compass-tasks/actions/install_callback.py
+++ b/compass-tasks-base/actions/install_callback.py
diff --git a/compass-tasks/actions/patch.py b/compass-tasks-base/actions/patch.py
index 6d29be6..6d29be6 100644
--- a/compass-tasks/actions/patch.py
+++ b/compass-tasks-base/actions/patch.py
diff --git a/compass-tasks/actions/poll_switch.py b/compass-tasks-base/actions/poll_switch.py
index 5c29b01..5c29b01 100644
--- a/compass-tasks/actions/poll_switch.py
+++ b/compass-tasks-base/actions/poll_switch.py
diff --git a/compass-tasks/actions/reinstall.py b/compass-tasks-base/actions/reinstall.py
index 62d1bcb..62d1bcb 100644
--- a/compass-tasks/actions/reinstall.py
+++ b/compass-tasks-base/actions/reinstall.py
diff --git a/compass-tasks/actions/search.py b/compass-tasks-base/actions/search.py
index 73ce1d9..73ce1d9 100644
--- a/compass-tasks/actions/search.py
+++ b/compass-tasks-base/actions/search.py
diff --git a/compass-tasks/actions/update_progress.py b/compass-tasks-base/actions/update_progress.py
index 67a9963..67a9963 100644
--- a/compass-tasks/actions/update_progress.py
+++ b/compass-tasks-base/actions/update_progress.py
diff --git a/compass-tasks/actions/util.py b/compass-tasks-base/actions/util.py
index 4d9f855..4d9f855 100644
--- a/compass-tasks/actions/util.py
+++ b/compass-tasks-base/actions/util.py
diff --git a/compass-tasks/apiclient/__init__.py b/compass-tasks-base/apiclient/__init__.py
index e69de29..e69de29 100644
--- a/compass-tasks/apiclient/__init__.py
+++ b/compass-tasks-base/apiclient/__init__.py
diff --git a/compass-tasks/apiclient/example.py b/compass-tasks-base/apiclient/example.py
index 4c01b98..4c01b98 100755
--- a/compass-tasks/apiclient/example.py
+++ b/compass-tasks-base/apiclient/example.py
diff --git a/compass-tasks/apiclient/restful.py b/compass-tasks-base/apiclient/restful.py
index bb82922..bb82922 100644
--- a/compass-tasks/apiclient/restful.py
+++ b/compass-tasks-base/apiclient/restful.py
diff --git a/compass-tasks/apiclient/v1/__init__.py b/compass-tasks-base/apiclient/v1/__init__.py
index e69de29..e69de29 100644
--- a/compass-tasks/apiclient/v1/__init__.py
+++ b/compass-tasks-base/apiclient/v1/__init__.py
diff --git a/compass-tasks/apiclient/v1/example.py b/compass-tasks-base/apiclient/v1/example.py
index 6f7a7f7..6f7a7f7 100755
--- a/compass-tasks/apiclient/v1/example.py
+++ b/compass-tasks-base/apiclient/v1/example.py
diff --git a/compass-tasks/apiclient/v1/restful.py b/compass-tasks-base/apiclient/v1/restful.py
index 3fb235c..3fb235c 100644
--- a/compass-tasks/apiclient/v1/restful.py
+++ b/compass-tasks-base/apiclient/v1/restful.py
diff --git a/compass-tasks-base/bin/switch_virtualenv.py b/compass-tasks-base/bin/switch_virtualenv.py
new file mode 100644
index 0000000..cd50ea0
--- /dev/null
+++ b/compass-tasks-base/bin/switch_virtualenv.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+#
+# Copyright 2014 Huawei Technologies Co. Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""utility switch to virtual env."""
+import os
+import site
+import sys
+
+
+virtual_env = '/root/.virtualenvs/compass-core'
+activate_this = '%s/bin/activate_this.py' % virtual_env
+execfile(activate_this, dict(__file__=activate_this))
+site.addsitedir('%s/lib/python2.7/site-packages' % virtual_env)
+if virtual_env not in sys.path:
+    sys.path.append(virtual_env)
+os.environ['PYTHON_EGG_CACHE'] = '/tmp/.egg'
diff --git a/compass-tasks/build.sh b/compass-tasks-base/build.sh
index e0dceea..9e76d25 100755
--- a/compass-tasks/build.sh
+++ b/compass-tasks-base/build.sh
@@ -10,6 +10,8 @@
 set -x
 COMPASS_DIR=${BASH_SOURCE[0]%/*}
 
+COMPASS_MODULE=(actions apiclient tasks utils deployment db hdsdiscovery log_analyzor)
+
 rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 sed -i 's/^mirrorlist=https/mirrorlist=http/g' /etc/yum.repos.d/epel.repo
 yum update -y
@@ -17,35 +19,40 @@ yum update -y
 yum --nogpgcheck install -y python python-devel git amqp python-pip libffi-devel openssl-devel gcc python-setuptools MySQL-python supervisor redis sshpass python-keyczar vim ansible-2.2.1.0 libyaml-devel make
 
 mkdir -p $COMPASS_DIR/compass
+for((i=0; i<${#COMPASS_MODULE[@]}; i++))
+do
+    mv $COMPASS_DIR/${COMPASS_MODULE[i]} $COMPASS_DIR/compass/
+done
 touch $COMPASS_DIR/compass/__init__.py
-mv $COMPASS_DIR/actions $COMPASS_DIR/compass/
-mv $COMPASS_DIR/apiclient $COMPASS_DIR/compass/
-mv $COMPASS_DIR/tasks $COMPASS_DIR/compass/
-mv $COMPASS_DIR/utils $COMPASS_DIR/compass/
-mv $COMPASS_DIR/deployment $COMPASS_DIR/compass/
-mv $COMPASS_DIR/db $COMPASS_DIR/compass/
-mv $COMPASS_DIR/hdsdiscovery $COMPASS_DIR/compass/
-mv $COMPASS_DIR/log_analyzor $COMPASS_DIR/compass/
-
-easy_install --upgrade pip
-pip install --upgrade pip
-pip install --upgrade setuptools
-pip install --upgrade Flask
 
 mkdir -p /etc/compass/
 mkdir -p /etc/compass/machine_list
 mkdir -p /etc/compass/switch_list
 mkdir -p /var/log/compass
 mkdir -p /opt/ansible_callbacks
+mkdir -p /opt/compass
 mkdir -p /root/.ssh;
 echo "UserKnownHostsFile /dev/null" >> /root/.ssh/config;
 echo "StrictHostKeyChecking no" >> /root/.ssh/config
 
+easy_install --upgrade pip
+pip install --upgrade pip
+pip install --upgrade setuptools
+pip install --upgrade Flask
+pip install --upgrade virtualenvwrapper
+
+source `which virtualenvwrapper.sh`
+mkvirtualenv --system-site-packages compass-core
+workon compass-core
 cd $COMPASS_DIR
+pip install -U -r requirements.txt
 python setup.py install
+cp -rf ./bin /opt/compass/bin
 cp supervisord.conf /etc/supervisord.conf
 cp start.sh /usr/local/bin/start.sh
+ln -s `which celery` /usr/bin/celery
+cd -
 
 yum clean all
 
-set -x
+set +x
diff --git a/compass-tasks/db/__init__.py b/compass-tasks-base/db/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/db/__init__.py
+++ b/compass-tasks-base/db/__init__.py
diff --git a/compass-tasks/db/api/__init__.py b/compass-tasks-base/db/api/__init__.py
index 5e42ae9..5e42ae9 100644
--- a/compass-tasks/db/api/__init__.py
+++ b/compass-tasks-base/db/api/__init__.py
diff --git a/compass-tasks/db/api/adapter.py b/compass-tasks-base/db/api/adapter.py
index c3ad48d..c3ad48d 100644
--- a/compass-tasks/db/api/adapter.py
+++ b/compass-tasks-base/db/api/adapter.py
diff --git a/compass-tasks/db/api/adapter_holder.py b/compass-tasks-base/db/api/adapter_holder.py
index 91c65c4..91c65c4 100644
--- a/compass-tasks/db/api/adapter_holder.py
+++ b/compass-tasks-base/db/api/adapter_holder.py
diff --git a/compass-tasks/db/api/cluster.py b/compass-tasks-base/db/api/cluster.py
index 7a7022c..7a7022c 100644
--- a/compass-tasks/db/api/cluster.py
+++ b/compass-tasks-base/db/api/cluster.py
diff --git a/compass-tasks/db/api/database.py b/compass-tasks-base/db/api/database.py
index 49769d7..49769d7 100644
--- a/compass-tasks/db/api/database.py
+++ b/compass-tasks-base/db/api/database.py
diff --git a/compass-tasks/db/api/health_check_report.py b/compass-tasks-base/db/api/health_check_report.py
index aaea7a7..aaea7a7 100644
--- a/compass-tasks/db/api/health_check_report.py
+++ b/compass-tasks-base/db/api/health_check_report.py
diff --git a/compass-tasks/db/api/host.py b/compass-tasks-base/db/api/host.py
index 15e0bb6..15e0bb6 100644
--- a/compass-tasks/db/api/host.py
+++ b/compass-tasks-base/db/api/host.py
diff --git a/compass-tasks/db/api/machine.py b/compass-tasks-base/db/api/machine.py
index b7b16b2..b7b16b2 100644
--- a/compass-tasks/db/api/machine.py
+++ b/compass-tasks-base/db/api/machine.py
diff --git a/compass-tasks/db/api/metadata.py b/compass-tasks-base/db/api/metadata.py
index 16310c8..16310c8 100644
--- a/compass-tasks/db/api/metadata.py
+++ b/compass-tasks-base/db/api/metadata.py
diff --git a/compass-tasks/db/api/metadata_holder.py b/compass-tasks-base/db/api/metadata_holder.py
index 24afc67..24afc67 100644
--- a/compass-tasks/db/api/metadata_holder.py
+++ b/compass-tasks-base/db/api/metadata_holder.py
diff --git a/compass-tasks/db/api/network.py b/compass-tasks-base/db/api/network.py
index e2bf7d3..e2bf7d3 100644
--- a/compass-tasks/db/api/network.py
+++ b/compass-tasks-base/db/api/network.py
diff --git a/compass-tasks/db/api/permission.py b/compass-tasks-base/db/api/permission.py
index f4d777a..f4d777a 100644
--- a/compass-tasks/db/api/permission.py
+++ b/compass-tasks-base/db/api/permission.py
diff --git a/compass-tasks/db/api/switch.py b/compass-tasks-base/db/api/switch.py
index 647eec0..647eec0 100644
--- a/compass-tasks/db/api/switch.py
+++ b/compass-tasks-base/db/api/switch.py
diff --git a/compass-tasks/db/api/user.py b/compass-tasks-base/db/api/user.py
index db039eb..db039eb 100644
--- a/compass-tasks/db/api/user.py
+++ b/compass-tasks-base/db/api/user.py
diff --git a/compass-tasks/db/api/user_log.py b/compass-tasks-base/db/api/user_log.py
index 70de9db..70de9db 100644
--- a/compass-tasks/db/api/user_log.py
+++ b/compass-tasks-base/db/api/user_log.py
diff --git a/compass-tasks/db/api/utils.py b/compass-tasks-base/db/api/utils.py
index a44f26e..a44f26e 100644
--- a/compass-tasks/db/api/utils.py
+++ b/compass-tasks-base/db/api/utils.py
diff --git a/compass-tasks/db/callback.py b/compass-tasks-base/db/callback.py
index 35798bc..35798bc 100644
--- a/compass-tasks/db/callback.py
+++ b/compass-tasks-base/db/callback.py
diff --git a/compass-tasks/db/config_validation/__init__.py b/compass-tasks-base/db/config_validation/__init__.py
index e69de29..e69de29 100644
--- a/compass-tasks/db/config_validation/__init__.py
+++ b/compass-tasks-base/db/config_validation/__init__.py
diff --git a/compass-tasks/db/config_validation/default_validator.py b/compass-tasks-base/db/config_validation/default_validator.py
index 224447f..224447f 100644
--- a/compass-tasks/db/config_validation/default_validator.py
+++ b/compass-tasks-base/db/config_validation/default_validator.py
diff --git a/compass-tasks/db/config_validation/extension/__init__.py b/compass-tasks-base/db/config_validation/extension/__init__.py
index e69de29..e69de29 100644
--- a/compass-tasks/db/config_validation/extension/__init__.py
+++ b/compass-tasks-base/db/config_validation/extension/__init__.py
diff --git a/compass-tasks/db/config_validation/extension/openstack.py b/compass-tasks-base/db/config_validation/extension/openstack.py
index 6b3af69..6b3af69 100644
--- a/compass-tasks/db/config_validation/extension/openstack.py
+++ b/compass-tasks-base/db/config_validation/extension/openstack.py
diff --git a/compass-tasks/db/exception.py b/compass-tasks-base/db/exception.py
index 44556c9..44556c9 100644
--- a/compass-tasks/db/exception.py
+++ b/compass-tasks-base/db/exception.py
diff --git a/compass-tasks/db/models.py b/compass-tasks-base/db/models.py
index d4b0324..d4b0324 100644
--- a/compass-tasks/db/models.py
+++ b/compass-tasks-base/db/models.py
diff --git a/compass-tasks/db/v1/model.py b/compass-tasks-base/db/v1/model.py
index d74e355..d74e355 100644
--- a/compass-tasks/db/v1/model.py
+++ b/compass-tasks-base/db/v1/model.py
diff --git a/compass-tasks/db/validator.py b/compass-tasks-base/db/validator.py
index 730bb52..730bb52 100644
--- a/compass-tasks/db/validator.py
+++ b/compass-tasks-base/db/validator.py
diff --git a/compass-tasks/deployment/__init__.py b/compass-tasks-base/deployment/__init__.py
index cbd36e0..cbd36e0 100644
--- a/compass-tasks/deployment/__init__.py
+++ b/compass-tasks-base/deployment/__init__.py
diff --git a/compass-tasks/deployment/deploy_manager.py b/compass-tasks-base/deployment/deploy_manager.py
index baf7cd6..baf7cd6 100644
--- a/compass-tasks/deployment/deploy_manager.py
+++ b/compass-tasks-base/deployment/deploy_manager.py
diff --git a/compass-tasks/deployment/installers/__init__.py b/compass-tasks-base/deployment/installers/__init__.py
index 0296be5..0296be5 100644
--- a/compass-tasks/deployment/installers/__init__.py
+++ b/compass-tasks-base/deployment/installers/__init__.py
diff --git a/compass-tasks/deployment/installers/config_manager.py b/compass-tasks-base/deployment/installers/config_manager.py
index 597c3a6..597c3a6 100644
--- a/compass-tasks/deployment/installers/config_manager.py
+++ b/compass-tasks-base/deployment/installers/config_manager.py
diff --git a/compass-tasks/deployment/installers/installer.py b/compass-tasks-base/deployment/installers/installer.py
index cfeb9e8..cfeb9e8 100644
--- a/compass-tasks/deployment/installers/installer.py
+++ b/compass-tasks-base/deployment/installers/installer.py
diff --git a/compass-tasks/deployment/installers/os_installers/__init__.py b/compass-tasks-base/deployment/installers/os_installers/__init__.py
index 5e42ae9..5e42ae9 100644
--- a/compass-tasks/deployment/installers/os_installers/__init__.py
+++ b/compass-tasks-base/deployment/installers/os_installers/__init__.py
diff --git a/compass-tasks/deployment/installers/os_installers/cobbler/__init__.py b/compass-tasks-base/deployment/installers/os_installers/cobbler/__init__.py
index 5e42ae9..5e42ae9 100644
--- a/compass-tasks/deployment/installers/os_installers/cobbler/__init__.py
+++ b/compass-tasks-base/deployment/installers/os_installers/cobbler/__init__.py
diff --git a/compass-tasks/deployment/installers/os_installers/cobbler/cobbler.py b/compass-tasks-base/deployment/installers/os_installers/cobbler/cobbler.py
index 9c2a935..9c2a935 100644
--- a/compass-tasks/deployment/installers/os_installers/cobbler/cobbler.py
+++ b/compass-tasks-base/deployment/installers/os_installers/cobbler/cobbler.py
diff --git a/compass-tasks/deployment/installers/pk_installers/__init__.py b/compass-tasks-base/deployment/installers/pk_installers/__init__.py
index 5e42ae9..5e42ae9 100644
--- a/compass-tasks/deployment/installers/pk_installers/__init__.py
+++ b/compass-tasks-base/deployment/installers/pk_installers/__init__.py
diff --git a/compass-tasks/deployment/installers/pk_installers/ansible_installer/__init__.py b/compass-tasks-base/deployment/installers/pk_installers/ansible_installer/__init__.py
index e69de29..e69de29 100644
--- a/compass-tasks/deployment/installers/pk_installers/ansible_installer/__init__.py
+++ b/compass-tasks-base/deployment/installers/pk_installers/ansible_installer/__init__.py
diff --git a/compass-tasks/deployment/installers/pk_installers/ansible_installer/ansible_installer.py b/compass-tasks-base/deployment/installers/pk_installers/ansible_installer/ansible_installer.py
index 0a86be4..0a86be4 100644
--- a/compass-tasks/deployment/installers/pk_installers/ansible_installer/ansible_installer.py
+++ b/compass-tasks-base/deployment/installers/pk_installers/ansible_installer/ansible_installer.py
diff --git a/compass-tasks/deployment/utils/__init__.py b/compass-tasks-base/deployment/utils/__init__.py
index cbd36e0..cbd36e0 100644
--- a/compass-tasks/deployment/utils/__init__.py
+++ b/compass-tasks-base/deployment/utils/__init__.py
diff --git a/compass-tasks/deployment/utils/constants.py b/compass-tasks-base/deployment/utils/constants.py
index e90b1b2..e90b1b2 100644
--- a/compass-tasks/deployment/utils/constants.py
+++ b/compass-tasks-base/deployment/utils/constants.py
diff --git a/compass-tasks/hdsdiscovery/SNMP_CONFIG.md b/compass-tasks-base/hdsdiscovery/SNMP_CONFIG.md
index 337b542..337b542 100644
--- a/compass-tasks/hdsdiscovery/SNMP_CONFIG.md
+++ b/compass-tasks-base/hdsdiscovery/SNMP_CONFIG.md
diff --git a/compass-tasks/hdsdiscovery/__init__.py b/compass-tasks-base/hdsdiscovery/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/__init__.py
diff --git a/compass-tasks/hdsdiscovery/base.py b/compass-tasks-base/hdsdiscovery/base.py
index 77b3b0b..77b3b0b 100644
--- a/compass-tasks/hdsdiscovery/base.py
+++ b/compass-tasks-base/hdsdiscovery/base.py
diff --git a/compass-tasks/hdsdiscovery/error.py b/compass-tasks-base/hdsdiscovery/error.py
index 5bcf1a2..5bcf1a2 100644
--- a/compass-tasks/hdsdiscovery/error.py
+++ b/compass-tasks-base/hdsdiscovery/error.py
diff --git a/compass-tasks/hdsdiscovery/hdmanager.py b/compass-tasks-base/hdsdiscovery/hdmanager.py
index 028d444..028d444 100644
--- a/compass-tasks/hdsdiscovery/hdmanager.py
+++ b/compass-tasks-base/hdsdiscovery/hdmanager.py
diff --git a/compass-tasks/hdsdiscovery/utils.py b/compass-tasks-base/hdsdiscovery/utils.py
index 72adb0a..72adb0a 100644
--- a/compass-tasks/hdsdiscovery/utils.py
+++ b/compass-tasks-base/hdsdiscovery/utils.py
diff --git a/compass-tasks/hdsdiscovery/vendors/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/appliance/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/appliance/__init__.py
index e69de29..e69de29 100644
--- a/compass-tasks/hdsdiscovery/vendors/appliance/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/appliance/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/appliance/appliance.py b/compass-tasks-base/hdsdiscovery/vendors/appliance/appliance.py
index 3d66f4e..3d66f4e 100644
--- a/compass-tasks/hdsdiscovery/vendors/appliance/appliance.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/appliance/appliance.py
diff --git a/compass-tasks/hdsdiscovery/vendors/appliance/plugins/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/appliance/plugins/__init__.py
index e69de29..e69de29 100644
--- a/compass-tasks/hdsdiscovery/vendors/appliance/plugins/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/appliance/plugins/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/appliance/plugins/mac.py b/compass-tasks-base/hdsdiscovery/vendors/appliance/plugins/mac.py
index cc14881..cc14881 100644
--- a/compass-tasks/hdsdiscovery/vendors/appliance/plugins/mac.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/appliance/plugins/mac.py
diff --git a/compass-tasks/hdsdiscovery/vendors/arista/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/arista/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/arista/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/arista/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/arista/arista.py b/compass-tasks-base/hdsdiscovery/vendors/arista/arista.py
index 5eacea1..5eacea1 100644
--- a/compass-tasks/hdsdiscovery/vendors/arista/arista.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/arista/arista.py
diff --git a/compass-tasks/hdsdiscovery/vendors/arista/plugins/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/arista/plugins/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/arista/plugins/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/arista/plugins/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/arista/plugins/mac.py b/compass-tasks-base/hdsdiscovery/vendors/arista/plugins/mac.py
index ed2f331..ed2f331 100644
--- a/compass-tasks/hdsdiscovery/vendors/arista/plugins/mac.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/arista/plugins/mac.py
diff --git a/compass-tasks/hdsdiscovery/vendors/hp/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/hp/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/hp/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/hp/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/hp/hp.py b/compass-tasks-base/hdsdiscovery/vendors/hp/hp.py
index 7ddc5e9..7ddc5e9 100644
--- a/compass-tasks/hdsdiscovery/vendors/hp/hp.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/hp/hp.py
diff --git a/compass-tasks/hdsdiscovery/vendors/hp/plugins/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/hp/plugins/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/hp/plugins/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/hp/plugins/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/hp/plugins/mac.py b/compass-tasks-base/hdsdiscovery/vendors/hp/plugins/mac.py
index 3bc81f4..3bc81f4 100644
--- a/compass-tasks/hdsdiscovery/vendors/hp/plugins/mac.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/hp/plugins/mac.py
diff --git a/compass-tasks/hdsdiscovery/vendors/huawei/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/huawei/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/huawei/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/huawei/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/huawei/huawei.py b/compass-tasks-base/hdsdiscovery/vendors/huawei/huawei.py
index 19fd043..19fd043 100644
--- a/compass-tasks/hdsdiscovery/vendors/huawei/huawei.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/huawei/huawei.py
diff --git a/compass-tasks/hdsdiscovery/vendors/huawei/plugins/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/huawei/plugins/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/huawei/plugins/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/huawei/plugins/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/huawei/plugins/mac.py b/compass-tasks-base/hdsdiscovery/vendors/huawei/plugins/mac.py
index 49d3863..49d3863 100644
--- a/compass-tasks/hdsdiscovery/vendors/huawei/plugins/mac.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/huawei/plugins/mac.py
diff --git a/compass-tasks/hdsdiscovery/vendors/ovswitch/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/ovswitch/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/ovswitch/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/ovswitch/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/ovswitch/ovswitch.py b/compass-tasks-base/hdsdiscovery/vendors/ovswitch/ovswitch.py
index 4d03328..4d03328 100644
--- a/compass-tasks/hdsdiscovery/vendors/ovswitch/ovswitch.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/ovswitch/ovswitch.py
diff --git a/compass-tasks/hdsdiscovery/vendors/ovswitch/plugins/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/ovswitch/plugins/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/ovswitch/plugins/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/ovswitch/plugins/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/ovswitch/plugins/mac.py b/compass-tasks-base/hdsdiscovery/vendors/ovswitch/plugins/mac.py
index 5f497a0..5f497a0 100644
--- a/compass-tasks/hdsdiscovery/vendors/ovswitch/plugins/mac.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/ovswitch/plugins/mac.py
diff --git a/compass-tasks/hdsdiscovery/vendors/pica8/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/pica8/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/pica8/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/pica8/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/pica8/pica8.py b/compass-tasks-base/hdsdiscovery/vendors/pica8/pica8.py
index 856817e..856817e 100644
--- a/compass-tasks/hdsdiscovery/vendors/pica8/pica8.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/pica8/pica8.py
diff --git a/compass-tasks/hdsdiscovery/vendors/pica8/plugins/__init__.py b/compass-tasks-base/hdsdiscovery/vendors/pica8/plugins/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/hdsdiscovery/vendors/pica8/plugins/__init__.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/pica8/plugins/__init__.py
diff --git a/compass-tasks/hdsdiscovery/vendors/pica8/plugins/mac.py b/compass-tasks-base/hdsdiscovery/vendors/pica8/plugins/mac.py
index d5ccfc0..d5ccfc0 100644
--- a/compass-tasks/hdsdiscovery/vendors/pica8/plugins/mac.py
+++ b/compass-tasks-base/hdsdiscovery/vendors/pica8/plugins/mac.py
diff --git a/compass-tasks/log_analyzor/__init__.py b/compass-tasks-base/log_analyzor/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/log_analyzor/__init__.py
+++ b/compass-tasks-base/log_analyzor/__init__.py
diff --git a/compass-tasks/log_analyzor/adapter_matcher.py b/compass-tasks-base/log_analyzor/adapter_matcher.py
index 8630e01..8630e01 100644
--- a/compass-tasks/log_analyzor/adapter_matcher.py
+++ b/compass-tasks-base/log_analyzor/adapter_matcher.py
diff --git a/compass-tasks/log_analyzor/environment.py b/compass-tasks-base/log_analyzor/environment.py
index 80ff738..80ff738 100644
--- a/compass-tasks/log_analyzor/environment.py
+++ b/compass-tasks-base/log_analyzor/environment.py
diff --git a/compass-tasks/log_analyzor/file_matcher.py b/compass-tasks-base/log_analyzor/file_matcher.py
index be3143b..be3143b 100644
--- a/compass-tasks/log_analyzor/file_matcher.py
+++ b/compass-tasks-base/log_analyzor/file_matcher.py
diff --git a/compass-tasks/log_analyzor/line_matcher.py b/compass-tasks-base/log_analyzor/line_matcher.py
index ada9ed6..ada9ed6 100644
--- a/compass-tasks/log_analyzor/line_matcher.py
+++ b/compass-tasks-base/log_analyzor/line_matcher.py
diff --git a/compass-tasks/log_analyzor/progress_calculator.py b/compass-tasks-base/log_analyzor/progress_calculator.py
index b0f35f2..b0f35f2 100644
--- a/compass-tasks/log_analyzor/progress_calculator.py
+++ b/compass-tasks-base/log_analyzor/progress_calculator.py
diff --git a/compass-tasks/misc/Dockerfile b/compass-tasks-base/misc/Dockerfile
index ed47aea..ed47aea 100644
--- a/compass-tasks/misc/Dockerfile
+++ b/compass-tasks-base/misc/Dockerfile
diff --git a/compass-tasks/misc/compass_install.repo b/compass-tasks-base/misc/compass_install.repo
index 6b97ed0..6b97ed0 100644
--- a/compass-tasks/misc/compass_install.repo
+++ b/compass-tasks-base/misc/compass_install.repo
diff --git a/compass-tasks/requirements.txt b/compass-tasks-base/requirements.txt
index 7e7ba40..5520a0b 100644
--- a/compass-tasks/requirements.txt
+++ b/compass-tasks-base/requirements.txt
@@ -20,4 +20,3 @@ SQLAlchemy>=0.9.0
 simplejson
 requests
 redis
-ansible==2.2.0
diff --git a/compass-tasks/setup.py b/compass-tasks-base/setup.py
index 5ee2e12..5ee2e12 100644
--- a/compass-tasks/setup.py
+++ b/compass-tasks-base/setup.py
diff --git a/compass-tasks/start.sh b/compass-tasks-base/start.sh
index 4d3956d..4d3956d 100755
--- a/compass-tasks/start.sh
+++ b/compass-tasks-base/start.sh
diff --git a/compass-tasks/supervisord.conf b/compass-tasks-base/supervisord.conf
index 9d993d3..9d993d3 100644
--- a/compass-tasks/supervisord.conf
+++ b/compass-tasks-base/supervisord.conf
diff --git a/compass-tasks/tasks/__init__.py b/compass-tasks-base/tasks/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/tasks/__init__.py
+++ b/compass-tasks-base/tasks/__init__.py
diff --git a/compass-tasks/tasks/client.py b/compass-tasks-base/tasks/client.py
index ca7ad14..ca7ad14 100644
--- a/compass-tasks/tasks/client.py
+++ b/compass-tasks-base/tasks/client.py
diff --git a/compass-tasks/tasks/tasks.py b/compass-tasks-base/tasks/tasks.py
index f649afd..f649afd 100644
--- a/compass-tasks/tasks/tasks.py
+++ b/compass-tasks-base/tasks/tasks.py
diff --git a/compass-tasks/utils/__init__.py b/compass-tasks-base/utils/__init__.py
index 4ee55a4..4ee55a4 100644
--- a/compass-tasks/utils/__init__.py
+++ b/compass-tasks-base/utils/__init__.py
diff --git a/compass-tasks/utils/celeryconfig_wrapper.py b/compass-tasks-base/utils/celeryconfig_wrapper.py
index b6644ba..b6644ba 100644
--- a/compass-tasks/utils/celeryconfig_wrapper.py
+++ b/compass-tasks-base/utils/celeryconfig_wrapper.py
diff --git a/compass-tasks/utils/flags.py b/compass-tasks-base/utils/flags.py
index a3169f5..a3169f5 100644
--- a/compass-tasks/utils/flags.py
+++ b/compass-tasks-base/utils/flags.py
diff --git a/compass-tasks/utils/logsetting.py b/compass-tasks-base/utils/logsetting.py
index 836ebcb..836ebcb 100644
--- a/compass-tasks/utils/logsetting.py
+++ b/compass-tasks-base/utils/logsetting.py
diff --git a/compass-tasks/utils/setting_wrapper.py b/compass-tasks-base/utils/setting_wrapper.py
index 0b3e9f7..0b3e9f7 100644
--- a/compass-tasks/utils/setting_wrapper.py
+++ b/compass-tasks-base/utils/setting_wrapper.py
diff --git a/compass-tasks/utils/util.py b/compass-tasks-base/utils/util.py
index 39978ca..39978ca 100644
--- a/compass-tasks/utils/util.py
+++ b/compass-tasks-base/utils/util.py
diff --git a/compass-tasks-k8s/Dockerfile b/compass-tasks-k8s/Dockerfile
deleted file mode 100644
index cd74cf8..0000000
--- a/compass-tasks-k8s/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM opnfv/compass-tasks:latest
-#FROM localbuild/compass-tasks
-
-ARG BRANCH=master
-
-ADD ./run.sh /root/
-RUN chmod +x /root/run.sh
-RUN /root/run.sh
diff --git a/compass-tasks-k8s/README.md b/compass-tasks-k8s/README.md
deleted file mode 100644
index 2dab2ee..0000000
--- a/compass-tasks-k8s/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# compass-tasks-k8s
diff --git a/compass-tasks-k8s/run.sh b/compass-tasks-k8s/run.sh
deleted file mode 100644
index 516ead0..0000000
--- a/compass-tasks-k8s/run.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016-2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -x
-COMPASS_DIR=${BASH_SOURCE[0]%/*}
-
-rm -rf  /opt/kargo_k8s
-git clone https://github.com/kubernetes-incubator/kubespray.git /opt/kargo_k8s
-
-cd /opt/kargo_k8s
-git checkout v2.2.0
-
-pip uninstall  ansible -y
-
-pip install ansible==2.3.1.0
-
-
-
-
diff --git a/compass-tasks-osa/Dockerfile b/compass-tasks-osa/Dockerfile
deleted file mode 100644
index 77cf585..0000000
--- a/compass-tasks-osa/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM opnfv/compass-tasks:latest
-#FROM localbuild/compass-tasks
-ARG BRANCH=master
-
-ADD ./run.sh /root/
-ADD ./tacker_conf /opt/tacker_conf
-RUN chmod +x /root/run.sh
-RUN /root/run.sh
diff --git a/compass-tasks-osa/run.sh b/compass-tasks-osa/run.sh
deleted file mode 100644
index fd6a5c9..0000000
--- a/compass-tasks-osa/run.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-yum install https://rdoproject.org/repos/openstack-ocata/rdo-release-ocata.rpm -y
-yum install git ntp wget ntpdate openssh-server python-devel sudo '@Development Tools' -y
-
-mkdir -p /opt/git/
-cd /opt/git/
-wget artifacts.opnfv.org/compass4nfv/package/openstack.tar.gz
-tar -zxvf openstack.tar.gz
-rm -rf openstack.tar.gz
-cd openstack
-git clone https://github.com/openstack/tacker.git -b stable/ocata
-cd tacker
-git checkout a0f1e680d81c7db66ae7a2a08c3d069901d0765a
-
-
-git clone https://git.openstack.org/openstack/openstack-ansible /opt/openstack-ansible
-
-cd /opt/openstack-ansible
-
-git checkout 7beba50a8345616ef27c70cbbcac962b56b8adc5
-
-/bin/cp -rf /opt/tacker_conf/ansible-role-requirements.yml /opt/openstack-ansible/
-/bin/cp -rf /opt/tacker_conf/openstack_services.yml /opt/openstack-ansible/playbooks/defaults/repo_packages/
-/bin/cp -rf /opt/tacker_conf/os-tacker-install.yml /opt/openstack-ansible/playbooks/
-/bin/cp -rf /opt/tacker_conf/setup-openstack.yml /opt/openstack-ansible/playbooks/
-/bin/cp -rf /opt/tacker_conf/tacker.yml /opt/openstack-ansible/playbooks/inventory/env.d/
-/bin/cp -rf /opt/tacker_conf/tacker_all.yml /opt/openstack-ansible/playbooks/inventory/group_vars/
-/bin/cp -rf /opt/tacker_conf/user_secrets.yml /opt/openstack-ansible/etc/openstack_deploy/
-/bin/cp -rf /opt/tacker_conf/haproxy_config.yml /opt/openstack-ansible/playbooks/vars/configs/
-
-/bin/cp -rf /opt/openstack-ansible/etc/openstack_deploy /etc/openstack_deploy
-
-cd /opt/openstack-ansible
-
-scripts/bootstrap-ansible.sh
-
-rm -f /usr/local/bin/ansible-playbook
-
-cd /opt/openstack-ansible/scripts/
-python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml
-
-cd /opt/openstack-ansible/playbooks/inventory/group_vars
-sed -i 's/#repo_build_git_cache/repo_build_git_cache/g' repo_all.yml
diff --git a/compass-tasks/Dockerfile b/compass-tasks/Dockerfile
index 4fcfbbc..fc9f06d 100644
--- a/compass-tasks/Dockerfile
+++ b/compass-tasks/Dockerfile
@@ -1,13 +1,7 @@
-FROM centos:7
+FROM opnfv/compass-tasks-base
 
-ARG BRANCH=master
-ADD . /root/compass-tasks
-
-RUN /root/compass-tasks/build.sh
-
-EXPOSE 6379
-
-VOLUME ["/var/ansible", "/etc/compass/machine_list", "/etc/compass/switch_list"]
-
-ENTRYPOINT ["/bin/bash", "-c"]
-CMD ["/usr/local/bin/start.sh"]
+ADD ./run.sh /root/
+#ADD ./tacker_conf /opt/tacker_conf
+ADD ./setup-complete.yml /opt/
+RUN chmod +x /root/run.sh
+RUN /root/run.sh
diff --git a/compass-tasks/run.sh b/compass-tasks/run.sh
new file mode 100644
index 0000000..dcc96e4
--- /dev/null
+++ b/compass-tasks/run.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+yum install https://rdoproject.org/repos/openstack-pike/rdo-release-pike.rpm -y
+yum install git ntp wget ntpdate openssh-server python-devel sudo '@Development Tools' -y
+
+systemctl stop firewalld
+systemctl mask firewalld
+
+pip install ansible==2.3.2.0
+rm -rf  /opt/kargo_k8s
+git clone https://github.com/kubernetes-incubator/kubespray.git /opt/kargo_k8s
+cd /opt/kargo_k8s
+git checkout v2.2.1
+
+mkdir -p /opt/git/
+cd /opt/git/
+wget artifacts.opnfv.org/compass4nfv/package/openstack_pike.tar.gz
+tar -zxvf openstack_pike.tar.gz
+rm -rf openstack_pike.tar.gz
+#cd openstack
+#git clone https://github.com/openstack/tacker.git -b stable/pike
+#cd tacker
+#git checkout a0f1e680d81c7db66ae7a2a08c3d069901d0765a
+
+
+git clone https://git.openstack.org/openstack/openstack-ansible /opt/openstack-ansible
+
+cd /opt/openstack-ansible
+
+#git checkout b962eed003580ee4c3bd69da911f20b3905a9176
+#git checkout da37351ca0a96ed38de72f3e00a7549a024cb810
+#git checkout 71110d6bc0f459b668948aca185139c1d79f0452
+git checkout 16c69046bfd90d1b984de43bc6267fece6b75f1c
+
+git checkout -b stable/pike
+
+#/bin/cp -rf /opt/tacker_conf/ansible-role-requirements.yml /opt/openstack-ansible/
+#/bin/cp -rf /opt/tacker_conf/openstack_services.yml /opt/openstack-ansible/playbooks/defaults/repo_packages/
+#/bin/cp -rf /opt/tacker_conf/os-tacker-install.yml /opt/openstack-ansible/playbooks/
+#/bin/cp -rf /opt/tacker_conf/setup-openstack.yml /opt/openstack-ansible/playbooks/
+#/bin/cp -rf /opt/tacker_conf/tacker.yml /opt/openstack-ansible/playbooks/inventory/env.d/
+#/bin/cp -rf /opt/tacker_conf/tacker_all.yml /opt/openstack-ansible/playbooks/inventory/group_vars/
+#/bin/cp -rf /opt/tacker_conf/user_secrets.yml /opt/openstack-ansible/etc/openstack_deploy/
+#/bin/cp -rf /opt/tacker_conf/haproxy_config.yml /opt/openstack-ansible/playbooks/vars/configs/
+
+/bin/cp -rf /opt/openstack-ansible/etc/openstack_deploy /etc/openstack_deploy
+
+cd /opt/openstack-ansible
+
+scripts/bootstrap-ansible.sh
+
+rm -f /usr/local/bin/ansible-playbook
+
+cd /opt/openstack-ansible/scripts/
+python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml
+
+cd /opt/openstack-ansible/group_vars
+sed -i 's/#repo_build_git_cache/repo_build_git_cache/g' repo_all.yml
+
+cp /opt/setup-complete.yml /opt/openstack-ansible/playbooks/
+echo "- include: setup-complete.yml" >> /opt/openstack-ansible/playbooks/setup-infrastructure.yml
+
+mv /usr/local/bin/ansible /tmp
diff --git a/compass-tasks/setup-complete.yml b/compass-tasks/setup-complete.yml
new file mode 100644
index 0000000..f8a7b54
--- /dev/null
+++ b/compass-tasks/setup-complete.yml
@@ -0,0 +1,7 @@
+---
+
+- hosts: localhost
+  user: root
+  tasks:
+    - name: Mark setup-infrastructure completed
+      shell: echo "Setup infrastructure completed!"
diff --git a/compass-tasks-osa/tacker_conf/ansible-role-requirements.yml b/compass-tasks/tacker_conf/ansible-role-requirements.yml
index 40e0f91..40e0f91 100644
--- a/compass-tasks-osa/tacker_conf/ansible-role-requirements.yml
+++ b/compass-tasks/tacker_conf/ansible-role-requirements.yml
diff --git a/compass-tasks-osa/tacker_conf/haproxy_config.yml b/compass-tasks/tacker_conf/haproxy_config.yml
index bbac6d7..bbac6d7 100644
--- a/compass-tasks-osa/tacker_conf/haproxy_config.yml
+++ b/compass-tasks/tacker_conf/haproxy_config.yml
diff --git a/compass-tasks-osa/tacker_conf/openstack_services.yml b/compass-tasks/tacker_conf/openstack_services.yml
index 5a772e5..5a772e5 100644
--- a/compass-tasks-osa/tacker_conf/openstack_services.yml
+++ b/compass-tasks/tacker_conf/openstack_services.yml
diff --git a/compass-tasks-osa/tacker_conf/os-tacker-install.yml b/compass-tasks/tacker_conf/os-tacker-install.yml
index dd96595..dd96595 100644
--- a/compass-tasks-osa/tacker_conf/os-tacker-install.yml
+++ b/compass-tasks/tacker_conf/os-tacker-install.yml
diff --git a/compass-tasks-osa/tacker_conf/setup-openstack.yml b/compass-tasks/tacker_conf/setup-openstack.yml
index d32eb15..d32eb15 100644
--- a/compass-tasks-osa/tacker_conf/setup-openstack.yml
+++ b/compass-tasks/tacker_conf/setup-openstack.yml
diff --git a/compass-tasks-osa/tacker_conf/tacker.yml b/compass-tasks/tacker_conf/tacker.yml
index 9ceabbc..9ceabbc 100644
--- a/compass-tasks-osa/tacker_conf/tacker.yml
+++ b/compass-tasks/tacker_conf/tacker.yml
diff --git a/compass-tasks-osa/tacker_conf/tacker_all.yml b/compass-tasks/tacker_conf/tacker_all.yml
index 95d5b83..95d5b83 100644
--- a/compass-tasks-osa/tacker_conf/tacker_all.yml
+++ b/compass-tasks/tacker_conf/tacker_all.yml
diff --git a/compass-tasks-osa/tacker_conf/user_secrets.yml b/compass-tasks/tacker_conf/user_secrets.yml
index b5a5796..b5a5796 100644
--- a/compass-tasks-osa/tacker_conf/user_secrets.yml
+++ b/compass-tasks/tacker_conf/user_secrets.yml