From 95efcf44650b9222ba17661eb001ac1c94362a44 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Thu, 30 Jun 2016 03:13:29 +0800 Subject: Update tacker related packages JIRA: COMPASS-423 Change-Id: I3efa0868c0147cc43b1df096ae89a6bdc42f4204 Signed-off-by: Yifei Xue --- .../roles/tacker/tasks/tacker_controller.yml | 21 +++++++++++++-------- .../ansible/roles/tacker/templates/tacker.j2 | 2 +- deploy/adapters/ansible/roles/tacker/vars/main.yml | 6 +++--- 3 files changed, 17 insertions(+), 12 deletions(-) (limited to 'deploy/adapters/ansible/roles/tacker') diff --git a/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml b/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml index 7bdc32e5..52cc3f3e 100755 --- a/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml +++ b/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml @@ -82,15 +82,19 @@ --internalurl 'http://{{ internal_vip.ip }}:8888/' tacker when: inventory_hostname == haproxy_hosts.keys()[0] +- name: install pip packages + shell: > + pip install tosca-parser heat-translator; + - name: install tacker shell: > - . /opt/admin-openrc.sh; pip install tosca-parser; cd {{ tacker_home }}; python setup.py install + . /opt/admin-openrc.sh; cd {{ tacker_home }}; python setup.py install -# - name: create 'tacker' directory in '/var/cache', set ownership and permissions -# shell: > -# sudo mkdir /var/cache/tacker +- name: create 'tacker' directory in '/var/cache', set ownership and permissions + shell: > + mkdir -p /var/cache/tacker # sudo chown :root /var/cache/tacker -# sudo chmod 700 /var/cache/tacker +# chmod 700 /var/cache/tacker - name: create 'tacker' directory in '/var/log' shell: mkdir -p /var/log/tacker @@ -102,9 +106,10 @@ - name: edit tacker configuration file shell: crudini --merge /usr/local/etc/tacker/tacker.conf < /opt/os_templates/tacker.j2 -#- name: populate tacker database -# shell: > -# . /opt/admin-openrc.sh; /usr/local/bin/tacker-db-manage --config-file /usr/local/etc/tacker/tacker.conf upgrade head +- name: populate tacker database + shell: > + . /opt/admin-openrc.sh; /usr/local/bin/tacker-db-manage --config-file /usr/local/etc/tacker/tacker.conf upgrade head + when: inventory_hostname == haproxy_hosts.keys()[0] - name: install tacker client shell: > diff --git a/deploy/adapters/ansible/roles/tacker/templates/tacker.j2 b/deploy/adapters/ansible/roles/tacker/templates/tacker.j2 index 2e51496e..5bc23473 100644 --- a/deploy/adapters/ansible/roles/tacker/templates/tacker.j2 +++ b/deploy/adapters/ansible/roles/tacker/templates/tacker.j2 @@ -17,7 +17,7 @@ project_name = service [agent] root_helper = sudo /usr/local/bin/tacker-rootwrap /usr/local/etc/tacker/rootwrap.conf -[DATABASE] +[database] connection = mysql://tacker:TACKER_DBPASS@{{ internal_vip.ip }}:3306/tacker?charset=utf8 [servicevm_nova] diff --git a/deploy/adapters/ansible/roles/tacker/vars/main.yml b/deploy/adapters/ansible/roles/tacker/vars/main.yml index 2df4ca3a..0ae6d9ef 100755 --- a/deploy/adapters/ansible/roles/tacker/vars/main.yml +++ b/deploy/adapters/ansible/roles/tacker/vars/main.yml @@ -6,9 +6,9 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -tacker_pkg_name: tacker-2014.2.0.dev206.tar.gz -tacker_client_pkg_name: python-tackerclient-0.0.1.dev85.tar.gz -tacker_horizon_pkg_name: tacker-horizon-0.0.1.dev687.tar.gz +tacker_pkg_name: tacker-0.3.1.tar.gz +tacker_client_pkg_name: python-tackerclient-0.3.1.tar.gz +tacker_horizon_pkg_name: tacker-horizon-0.3.1.tar.gz tacker_home: /opt/tacker/ tacker_client_home: /opt/tacker_client/ tacker_horizon_home: /opt/tacker_horizon/ -- cgit 1.2.3-korg