13 files changed, 37 insertions, 30 deletions
diff --git a/compass-deck/api/__init__.py b/compass-deck/api/__init__.py
index 784fe23..e2d2544 100644
--- a/compass-deck/api/__init__.py
+++ b/compass-deck/api/__init__.py
@@ -14,7 +14,7 @@
 
 import datetime
 from flask import Blueprint
-from flask.ext.login import LoginManager
+from flask_login import LoginManager
 from flask import Flask
 
 # from compass.api.v1.api import v1_app
diff --git a/compass-deck/api/api.py b/compass-deck/api/api.py
index e1cdd39..1fa10f2 100644
--- a/compass-deck/api/api.py
+++ b/compass-deck/api/api.py
@@ -22,10 +22,10 @@ import netaddr
 import requests
 import simplejson as json
 
-from flask.ext.login import current_user
-from flask.ext.login import login_required
-from flask.ext.login import login_user
-from flask.ext.login import logout_user
+from flask_login import current_user
+from flask_login import login_required
+from flask_login import login_user
+from flask_login import logout_user
 from flask import request
 
 from compass.api import app
diff --git a/compass-deck/api/v1/api.py b/compass-deck/api/v1/api.py
index 9dbc548..345746a 100644
--- a/compass-deck/api/v1/api.py
+++ b/compass-deck/api/v1/api.py
@@ -19,7 +19,7 @@ import simplejson as json
 from flask import Blueprint
 from flask import request
 
-from flask.ext.restful import Resource
+from flask_restful import Resource
 
 from compass.api.exception import BadRequest
 from compass.api.exception import Forbidden
diff --git a/compass-deck/bin/manage_db.py b/compass-deck/bin/manage_db.py
index 3e56433..38bbc43 100755
--- a/compass-deck/bin/manage_db.py
+++ b/compass-deck/bin/manage_db.py
@@ -26,7 +26,7 @@ sys.path.append(current_dir)
 
 import switch_virtualenv
 
-from flask.ext.script import Manager
+from flask_script import Manager
 
 from compass.api import app
 from compass.db.api import database
diff --git a/compass-deck/db/api/user.py b/compass-deck/db/api/user.py
index db039eb..0105797 100644
--- a/compass-deck/db/api/user.py
+++ b/compass-deck/db/api/user.py
@@ -18,7 +18,7 @@ import functools
 import logging
 import re
 
-from flask.ext.login import UserMixin
+from flask_login import UserMixin
 
 from compass.db.api import database
 from compass.db.api import utils
diff --git a/compass-deck/db/v1/model.py b/compass-deck/db/v1/model.py
index d74e355..f84557c 100644
--- a/compass-deck/db/v1/model.py
+++ b/compass-deck/db/v1/model.py
@@ -28,7 +28,7 @@ from sqlalchemy.ext.hybrid import hybrid_property
 
 from compass.utils import util
 
-from flask.ext.login import UserMixin
+from flask_login import UserMixin
 from itsdangerous import URLSafeTimedSerializer
 
 BASE = declarative_base()
diff --git a/compass-deck/requirements.txt b/compass-deck/requirements.txt
index 6a3b3c7..3f8c34a 100644
--- a/compass-deck/requirements.txt
+++ b/compass-deck/requirements.txt
@@ -1,6 +1,6 @@
 amqplib
 argparse
-celery
+celery<=4.1.0
 Markdown<2.5
 Cheetah<=2.4.1
 daemon
diff --git a/compass-tasks-base/db/api/user.py b/compass-tasks-base/db/api/user.py
index db039eb..0105797 100644
--- a/compass-tasks-base/db/api/user.py
+++ b/compass-tasks-base/db/api/user.py
@@ -18,7 +18,7 @@ import functools
 import logging
 import re
 
-from flask.ext.login import UserMixin
+from flask_login import UserMixin
 
 from compass.db.api import database
 from compass.db.api import utils
diff --git a/compass-tasks-base/db/v1/model.py b/compass-tasks-base/db/v1/model.py
index d74e355..f84557c 100644
--- a/compass-tasks-base/db/v1/model.py
+++ b/compass-tasks-base/db/v1/model.py
@@ -28,7 +28,7 @@ from sqlalchemy.ext.hybrid import hybrid_property
 
 from compass.utils import util
 
-from flask.ext.login import UserMixin
+from flask_login import UserMixin
 from itsdangerous import URLSafeTimedSerializer
 
 BASE = declarative_base()
diff --git a/compass-tasks-osa/Dockerfile b/compass-tasks-osa/Dockerfile
index 91abdc8..bc2a0c2 100644
--- a/compass-tasks-osa/Dockerfile
+++ b/compass-tasks-osa/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/compass-tasks-base
 ARG BRANCH=master
 
 ADD ./run.sh /root/
-ADD ./tacker_conf /opt/tacker_conf
+#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-osa/Dockerfile-arm64 b/compass-tasks-osa/Dockerfile-arm64
index 811d546..cb560b3 100644
--- a/compass-tasks-osa/Dockerfile-arm64
+++ b/compass-tasks-osa/Dockerfile-arm64
@@ -1,3 +1,5 @@
 FROM opnfv/compass-tasks-base
+ARG BRANCH=master
 
-# TODO: support arm64
+ADD ./run.sh /root/
+# TODO
diff --git a/compass-tasks-osa/run.sh b/compass-tasks-osa/run.sh
index 63e5cb0..aa924b8 100644
--- a/compass-tasks-osa/run.sh
+++ b/compass-tasks-osa/run.sh
@@ -1,35 +1,38 @@
 #!/bin/bash
 
+pip install pyyaml
+
 # add ansible-playbook for normal use
 ln -s /root/.virtualenvs/compass-core/bin/ansible-playbook /usr/bin/ansible-playbook
 
-yum install https://rdoproject.org/repos/openstack-pike/rdo-release-pike.rpm -y
+yum install https://rdoproject.org/repos/openstack-queens/rdo-release-queens.rpm -y
 yum install git ntp wget ntpdate openssh-server python-devel sudo '@Development Tools' -y
 
 systemctl stop firewalld
 systemctl mask firewalld
 
-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
+#mkdir -p /opt/git/
+#cd /opt/git/
+#wget artifacts.opnfv.org/compass4nfv/package/openstack_queens.tar.gz
+#tar -zxvf openstack_queens.tar.gz
+#rm -rf openstack_queens.tar.gz
 
 git clone https://git.openstack.org/openstack/openstack-ansible /opt/openstack-ansible
 
 cd /opt/openstack-ansible
 
-git checkout 16c69046bfd90d1b984de43bc6267fece6b75f1c
+git checkout 2f52fec3cdefcfb0bcc41a807380ecd88fae072e
+#git checkout 16c69046bfd90d1b984de43bc6267fece6b75f1c
 #git checkout 4cde8f86aaea1fde7c43016f661119879068a133
 
-git checkout -b stable/pike
+git checkout -b stable/queens
 
-/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/tacker.yml /opt/openstack-ansible/playbooks/inventory/env.d/
-/bin/cp -rf /opt/tacker_conf/tacker_all.yml /opt/openstack-ansible/group_vars/
-/bin/cp -rf /opt/tacker_conf/user_secrets.yml /opt/openstack-ansible/etc/openstack_deploy/
+#/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/tacker.yml /opt/openstack-ansible/playbooks/inventory/env.d/
+#/bin/cp -rf /opt/tacker_conf/tacker_all.yml /opt/openstack-ansible/group_vars/
+#/bin/cp -rf /opt/tacker_conf/user_secrets.yml /opt/openstack-ansible/etc/openstack_deploy/
 
 /bin/cp -rf /opt/openstack-ansible/etc/openstack_deploy /etc/openstack_deploy
 
@@ -42,7 +45,7 @@ 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
+cd /opt/openstack-ansible/inventory/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/
diff --git a/compass-tasks/Dockerfile-arm64 b/compass-tasks/Dockerfile-arm64
index 811d546..cb560b3 100644
--- a/compass-tasks/Dockerfile-arm64
+++ b/compass-tasks/Dockerfile-arm64
@@ -1,3 +1,5 @@
 FROM opnfv/compass-tasks-base
+ARG BRANCH=master
 
-# TODO: support arm64
+ADD ./run.sh /root/
+# TODO