From d6e99bb0819b1e0675ea642fd81f5bfcd568ebfb Mon Sep 17 00:00:00 2001
From: "carey.xu" <carey.xuhan@huawei.com>
Date: Tue, 30 Jun 2015 14:53:17 +0800
Subject: update ansible roles directory for supporting commpass-core
 installing

BGS-80

Change-Id: I97a5d2a9b1f6c799c1976ec1cf6e687b108e0d0f
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
---
 .../openstack_juno/roles/database/tasks/main.yml   | 12 -----
 .../roles/database/tasks/mariadb.yml               | 61 ----------------------
 .../openstack_juno/roles/database/tasks/mysql.yml  | 22 --------
 3 files changed, 95 deletions(-)
 delete mode 100644 compass/deploy/ansible/openstack_juno/roles/database/tasks/main.yml
 delete mode 100644 compass/deploy/ansible/openstack_juno/roles/database/tasks/mariadb.yml
 delete mode 100644 compass/deploy/ansible/openstack_juno/roles/database/tasks/mysql.yml

(limited to 'compass/deploy/ansible/openstack_juno/roles/database/tasks')

diff --git a/compass/deploy/ansible/openstack_juno/roles/database/tasks/main.yml b/compass/deploy/ansible/openstack_juno/roles/database/tasks/main.yml
deleted file mode 100644
index e66f0cd..0000000
--- a/compass/deploy/ansible/openstack_juno/roles/database/tasks/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: copy data.sh
-  template: src=data.j2 dest=/opt/data.sh mode=777
-  tags:
-    - mysql_user
-
-- include: mysql.yml
-  when: HA_CLUSTER is not defined
-
-- include: mariadb.yml
-  when: HA_CLUSTER is defined
-
diff --git a/compass/deploy/ansible/openstack_juno/roles/database/tasks/mariadb.yml b/compass/deploy/ansible/openstack_juno/roles/database/tasks/mariadb.yml
deleted file mode 100644
index f87ea2f..0000000
--- a/compass/deploy/ansible/openstack_juno/roles/database/tasks/mariadb.yml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-- name: install python-mysqldb
-  apt: name={{ item }} state=present force=yes
-  with_items:
-      - libaio1
-      - libssl0.9.8
-      #- mariadb-client-5.5
-      - mysql-client-5.5
-      - python-mysqldb
-
-- name: download mariadb and galera deb package
-  get_url: url={{ item.url }} dest=/opt/{{ item.filename }}
-  register: result
-  until: result|success
-  retries: 5
-  delay: 3
-  with_items:
-    - { url:  "{{ MARIADB_URL }}", filename: "{{ MARIADB }}" }
-    - { url:  "{{ GALERA_URL }}", filename: "{{ GALERA }}" }
-
-- name: install mariadb  and galera packages
-  command: dpkg -i /opt/{{ item }}
-  with_items:
-    - "{{ MARIADB }}"
-    - "{{ GALERA }}"
-
-- name: create mysql log directy
-  file: path=/var/log/mysql state=directory owner=mysql group=mysql mode=0755
-
-- name: update mariadb my.cnf
-  template: src=my.cnf dest=/etc/mysql/my.cnf backup=yes
-
-- name: update galera wsrep.cnf
-  template: src=wsrep.cnf dest=/etc/mysql/conf.d/wsrep.cnf backup=yes
-
-- name: update wsrep_sst_rsync uid 
-  lineinfile: dest=/usr/bin/wsrep_sst_rsync state=absent regexp="\s*uid = \$MYUID$"  backup=yes
-
-- name: update wsrep_sst_rsync gid 
-  lineinfile: dest=/usr/bin/wsrep_sst_rsync state=absent regexp="\s*gid = \$MYGID$"  backup=yes
-
-- name: manually restart mysql server
-  service: name=mysql state=restarted enabled=yes
-  register: result
-  until: result|success
-  retries: 5
-  delay: 5
-  tags:
-    - mysql_restart
-
-- name: generate mysql service list
-  shell: echo {{ item }} >> /opt/service
-  with_items:
-   - mysql
-
-
-- name: create database/user
-  shell: /opt/data.sh
-  when: HA_CLUSTER[inventory_hostname] == ''
-  tags:
-    - mysql_user
diff --git a/compass/deploy/ansible/openstack_juno/roles/database/tasks/mysql.yml b/compass/deploy/ansible/openstack_juno/roles/database/tasks/mysql.yml
deleted file mode 100644
index 327b656..0000000
--- a/compass/deploy/ansible/openstack_juno/roles/database/tasks/mysql.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: install mysql client and server packages
-  apt: name={{ item }} state=present
-  with_items:
-    - python-mysqldb
-    - mysql-server
-
-- name: create mysql log directy
-  file: path=/var/log/mysql state=directory owner=mysql group=mysql mode=0755
-
-- name: update mysql my.cnf
-  copy: src=my.cnf
-        dest=/etc/mysql/my.cnf
-        backup=yes
-
-- name: manually restart mysql server
-  shell: service mysql restart
-
-- name: create database/user
-  shell: /opt/data.sh
-  tags:
-    - mysql_user
-- 
cgit 1.2.3-korg