From 377fb11ea6b8345f93a43034540c264094a9b2bd Mon Sep 17 00:00:00 2001
From: Artur Zarzycki <azarzycki@mirantis.com>
Date: Mon, 13 Feb 2017 14:55:48 +0100
Subject: [PATCH] Change multideployment script to use galera

Change-Id: I31d430060d3e3fe65ad5c443317f3621e30cfda7
Depends-On: I9db9fcb7a5f78312dabc23ed2ff56cb0a9748f4d
Depends-On: Ia523eb74f7222182fcebd6037536f589dddd5cb6
---
 .../ccp-multi-deploy/config/ccp-configs-common.yaml  |  7 +++++--
 tools/ccp-multi-deploy/config/ccp-roles.yaml         |  5 ++++-
 tools/ccp-multi-deploy/config/ccp-topology-1.yaml    |  4 ++++
 tools/ccp-multi-deploy/config/ccp-topology-2.yaml    |  4 ++++
 tools/ccp-multi-deploy/config/ccp-topology-3.yaml    |  4 ++++
 .../config/multiple-deployments-topology.yaml        | 12 ++++++++++++
 6 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/tools/ccp-multi-deploy/config/ccp-configs-common.yaml b/tools/ccp-multi-deploy/config/ccp-configs-common.yaml
index 17fc997d..0b281ac4 100644
--- a/tools/ccp-multi-deploy/config/ccp-configs-common.yaml
+++ b/tools/ccp-multi-deploy/config/ccp-configs-common.yaml
@@ -8,6 +8,9 @@ builder:
 registry:
   address: "127.0.0.1:31500"
   timeout: 1500
+replicas:
+  galera: 3
+  rabbitmq: 3
 repositories:
   path: /tmp/ccp-repos
   skip_empty: True
@@ -19,6 +22,8 @@ repositories:
       name: entrypoint
     - git_url: https://git.openstack.org/openstack/fuel-ccp-etcd
       name: etcd
+    - git_url: https://git.openstack.org/openstack/fuel-ccp-galera
+      name: galera
     - git_url: https://git.openstack.org/openstack/fuel-ccp-glance
       name: glance
     - git_url: https://git.openstack.org/openstack/fuel-ccp-heat
@@ -27,8 +32,6 @@ repositories:
       name: horizon
     - git_url: https://git.openstack.org/openstack/fuel-ccp-keystone
       name: keystone
-    - git_url: https://git.openstack.org/openstack/fuel-ccp-mariadb
-      name: mariadb
     - git_url: https://git.openstack.org/openstack/fuel-ccp-memcached
       name: memcached
     - git_url: https://git.openstack.org/openstack/fuel-ccp-neutron
diff --git a/tools/ccp-multi-deploy/config/ccp-roles.yaml b/tools/ccp-multi-deploy/config/ccp-roles.yaml
index 0b206bbe..dbda200c 100644
--- a/tools/ccp-multi-deploy/config/ccp-roles.yaml
+++ b/tools/ccp-multi-deploy/config/ccp-roles.yaml
@@ -1,5 +1,9 @@
 ---
 roles:
+  db:
+    - galera
+  messaging:
+    - rabbitmq
   controller-net-host:
     - neutron-dhcp-agent
     - neutron-l3-agent
@@ -13,7 +17,6 @@ roles:
     - heat-engine
     - horizon
     - keystone
-    - mariadb
     - memcached
     - neutron-server
     - nova-api
diff --git a/tools/ccp-multi-deploy/config/ccp-topology-1.yaml b/tools/ccp-multi-deploy/config/ccp-topology-1.yaml
index d76e3e85..9bb7a7dd 100644
--- a/tools/ccp-multi-deploy/config/ccp-topology-1.yaml
+++ b/tools/ccp-multi-deploy/config/ccp-topology-1.yaml
@@ -5,9 +5,13 @@ nodes:
       - controller-net-bridge
   node1:
     roles:
+      - db
+      - messaging
       - openvswitch
       - controller-net-host
   node[2-3]:
     roles:
+      - db
+      - messaging
       - openvswitch
       - compute
diff --git a/tools/ccp-multi-deploy/config/ccp-topology-2.yaml b/tools/ccp-multi-deploy/config/ccp-topology-2.yaml
index 445b7058..4b5a821b 100644
--- a/tools/ccp-multi-deploy/config/ccp-topology-2.yaml
+++ b/tools/ccp-multi-deploy/config/ccp-topology-2.yaml
@@ -5,9 +5,13 @@ nodes:
       - controller-net-bridge
   node4:
     roles:
+      - db
+      - messaging
       - openvswitch
       - controller-net-host
   node[5-6]:
     roles:
+      - db
+      - messaging
       - openvswitch
       - compute
diff --git a/tools/ccp-multi-deploy/config/ccp-topology-3.yaml b/tools/ccp-multi-deploy/config/ccp-topology-3.yaml
index 3bd9c02f..c8bb28e1 100644
--- a/tools/ccp-multi-deploy/config/ccp-topology-3.yaml
+++ b/tools/ccp-multi-deploy/config/ccp-topology-3.yaml
@@ -5,9 +5,13 @@ nodes:
       - controller-net-bridge
   node7:
     roles:
+      - db
+      - messaging
       - openvswitch
       - controller-net-host
   node[8-9]:
     roles:
+      - db
+      - messaging
       - openvswitch
       - compute
diff --git a/tools/ccp-multi-deploy/config/multiple-deployments-topology.yaml b/tools/ccp-multi-deploy/config/multiple-deployments-topology.yaml
index 8d35c40e..ccbdb918 100644
--- a/tools/ccp-multi-deploy/config/multiple-deployments-topology.yaml
+++ b/tools/ccp-multi-deploy/config/multiple-deployments-topology.yaml
@@ -6,26 +6,38 @@
 
 
 node1:
+  - db[1]
+  - messaging[1]
   - openvswitch[1]
   - controller-net-host[1]
   - controller-net-bridge[.*]
 node[2-3]
+  - db[1]
+  - messaging[1]
   - openvswitch[1]
   - compute[1]
   - controller-net-bridge[.*]
 node4:
+  - db[2]
+  - messaging[2]
   - openvswitch[2]
   - controller-net-host[2]
   - controller-net-bridge[.*]
 node[5-6]
+  - db[2]
+  - messaging[2]
   - openvswitch[2]
   - compute[2]
   - controller-net-bridge[.*]
 node7:
+  - db[3]
+  - messaging[3]
   - openvswitch[3]
   - controller-net-host[3]
   - controller-net-bridge[.*]
 node[8-9]:
+  - db[3]
+  - messaging[3]
   - openvswitch[3]
   - compute[3]
   - controller-net-bridge[.*]