From b5bbb70458d2f4c522f605f5359c183449a1f4c3 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Mon, 18 May 2015 14:34:07 +0000
Subject: OpenStack: Stop using Ansible modules for db sync-ing

Every component has its own idempotent script to intitiate the
databases, and they are maintained, whereas the Ansible modules
have started failing with Kilo.

Change-Id: I02aa4457b73177f706fdc5c4b29bca3e5883153e
---
 install-files/openstack/usr/share/openstack/cinder-db.yml | 3 +--
 install-files/openstack/usr/share/openstack/glance.yml    | 3 +--
 install-files/openstack/usr/share/openstack/keystone.yml  | 5 ++---
 install-files/openstack/usr/share/openstack/nova-db.yml   | 3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/install-files/openstack/usr/share/openstack/cinder-db.yml b/install-files/openstack/usr/share/openstack/cinder-db.yml
index 2a211720..5f89da37 100644
--- a/install-files/openstack/usr/share/openstack/cinder-db.yml
+++ b/install-files/openstack/usr/share/openstack/cinder-db.yml
@@ -54,7 +54,6 @@
     sudo_user: cinder
 
   - name: Initiate cinder database
-    cinder_manage:
-        action: dbsync
+    command: cinder-manage db sync
     sudo: yes
     sudo_user: cinder
diff --git a/install-files/openstack/usr/share/openstack/glance.yml b/install-files/openstack/usr/share/openstack/glance.yml
index aa7e4c78..830f2bd3 100644
--- a/install-files/openstack/usr/share/openstack/glance.yml
+++ b/install-files/openstack/usr/share/openstack/glance.yml
@@ -78,8 +78,7 @@
     sudo_user: glance
 
   - name: Initiate glance database
-    glance_manage:
-        action: dbsync
+    command: glance-manage db_sync
     sudo: yes
     sudo_user: glance
 
diff --git a/install-files/openstack/usr/share/openstack/keystone.yml b/install-files/openstack/usr/share/openstack/keystone.yml
index 330d74d0..00bcac1a 100644
--- a/install-files/openstack/usr/share/openstack/keystone.yml
+++ b/install-files/openstack/usr/share/openstack/keystone.yml
@@ -88,9 +88,8 @@
     sudo: yes
     sudo_user: keystone
 
-  - name: Initiatie keystone database
-    keystone_manage:
-        action: dbsync
+  - name: Initiate keystone database
+    command: keystone-manage db_sync
     sudo: yes
     sudo_user: keystone
 
diff --git a/install-files/openstack/usr/share/openstack/nova-db.yml b/install-files/openstack/usr/share/openstack/nova-db.yml
index e7dc5b10..800d6c4b 100644
--- a/install-files/openstack/usr/share/openstack/nova-db.yml
+++ b/install-files/openstack/usr/share/openstack/nova-db.yml
@@ -45,7 +45,6 @@
     sudo_user: nova
 
   - name: Initiate nova database
-    nova_manage:
-        action: dbsync
+    command: nova-manage db sync
     sudo: yes
     sudo_user: nova
-- 
cgit v1.2.1