summaryrefslogtreecommitdiffstats
path: root/compass-tasks
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-01-09 15:46:44 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-01-09 15:46:44 +0800
commit8ec10f60d0fc9bfc43fcea57d6c809646bd4a48a (patch)
tree34d8687f1a24e6d44128b2c41f7058e0dc81cf92 /compass-tasks
parent9701137e6971a0d17214492f4c5b6d6955eb2de3 (diff)
Change OSA commit id
1. Use commit id 16c69046bfd90d1b984de43bc6267fece6b75f1c to avoid flush handler issue 2. Install ansible 2.2.1.0 in compass-tasks-base virtualenv Change-Id: I257b2f93baa2e36c3b26299782495b8e8c42d06c Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'compass-tasks')
-rw-r--r--compass-tasks/run.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/compass-tasks/run.sh b/compass-tasks/run.sh
index 1897191..2ab0b6f 100644
--- a/compass-tasks/run.sh
+++ b/compass-tasks/run.sh
@@ -30,8 +30,8 @@ cd /opt/openstack-ansible
#git checkout b962eed003580ee4c3bd69da911f20b3905a9176
#git checkout da37351ca0a96ed38de72f3e00a7549a024cb810
#git checkout 71110d6bc0f459b668948aca185139c1d79f0452
-#git checkout 16c69046bfd90d1b984de43bc6267fece6b75f1c
-git checkout 4cde8f86aaea1fde7c43016f661119879068a133
+git checkout 16c69046bfd90d1b984de43bc6267fece6b75f1c
+#git checkout 4cde8f86aaea1fde7c43016f661119879068a133
git checkout -b stable/pike
@@ -62,7 +62,7 @@ cp /opt/setup-complete.yml /opt/openstack-ansible/playbooks/
echo "- include: setup-complete.yml" >> /opt/openstack-ansible/playbooks/setup-infrastructure.yml
# rm ansible json module
-# mv /usr/lib/python2.7/site-packages/ansible/plugins/callback/json.py* /tmp/
+# mv /root/.virtualenvs/compass-core/lib/python2.7/site-packages/ansible/plugins/callback/json.py* /tmp/
# add ansible-playbook for normal use
ln -s /root/.virtualenvs/compass-core/bin/ansible-playbook /usr/bin/ansible-playbook