From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Mon, 19 Dec 2016 11:06:36 +0800 Subject: master only support newton JIRA: COMPASS-513 Remove other roles and ppa, master only support newton. Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00 Signed-off-by: liyuenan --- .../roles/congress/tasks/congress_config.yml | 15 --------- .../roles/congress/tasks/congress_db.yml | 28 ---------------- .../roles/congress/tasks/congress_install.yml | 37 ---------------------- .../roles/congress/tasks/main.yml | 16 ---------- 4 files changed, 96 deletions(-) delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_config.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_db.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_install.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/main.yml (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks') diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_config.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_config.yml deleted file mode 100644 index f40d4c22..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_config.yml +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################## -# Copyright (c) 2016 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 -############################################################################## ---- -- name: congress db sync - shell: /usr/local/bin/congress-db-manage --config-file /etc/congress/congress.conf upgrade head - when: inventory_hostname == haproxy_hosts.keys()[0] - -- name: start congress service - shell: systemctl start congress.service diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_db.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_db.yml deleted file mode 100644 index 1883509b..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_db.yml +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# Copyright (c) 2016 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 -############################################################################## ---- -- name: create congress db - mysql_db: - login_unix_socket: /var/run/mysqld/mysqld.sock - name: "{{ item.db }}" - state: present - with_items: "{{ credentials }}" - -- name: create congress db user - mysql_user: - login_unix_socket: /var/run/mysqld/mysqld.sock - name: "{{ item[0].user }}" - password: "{{ item[0].password }}" - priv: "*.*:ALL,GRANT" - host: "{{ item[1] }}" - state: present - with_nested: - - "{{ credentials }}" - - ['%', 'localhost'] - diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_install.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_install.yml deleted file mode 100644 index 19eed11c..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/congress_install.yml +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################## -# Copyright (c) 2016 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 -############################################################################## ---- -- include_vars: "{{ ansible_os_family }}.yml" - -- name: install congress packages - pip: name={{ item }} state=present - with_items: packages - -- name: create congress etc directory - file: path=/etc/congress state=directory - -- name: update congress conf - template: src={{ item }} dest=/etc/congress/{{ item }} - backup=yes - with_items: - - congress.conf - - api-paste.ini - - policy.json - -- name: create congress service - copy: src=congress.service dest=/lib/systemd/system/ - -- name: create congress service work dir - file: path=/var/lib/congress state=directory - -- name: link the congress service - file: - src: /lib/systemd/system/congress.service - dest: /etc/systemd/system/multi-user.target.wants/congress.service - state: link diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/main.yml deleted file mode 100644 index f8056d15..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/congress/tasks/main.yml +++ /dev/null @@ -1,16 +0,0 @@ -############################################################################## -# Copyright (c) 2016 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 -############################################################################## ---- -- include: congress_install.yml - -- include: congress_db.yml - when: - - inventory_hostname == haproxy_hosts.keys()[0] - -- include: congress_config.yml -- cgit 1.2.3-korg