Browse Source

Merge "Enable Galera as a default DB"

Jenkins 2 years ago
parent
commit
5aa10c9cb1

+ 14
- 1
doc/source/quickstart.rst View File

@@ -150,6 +150,19 @@ your environment may be different.
150 150
 For the additional info about bootstrapping configuration please read the
151 151
 :doc:`bootstrapping`.
152 152
 
153
+Append replicas configuration:
154
+
155
+::
156
+
157
+    cat >> ~/.ccp.yaml << EOF
158
+    replicas:
159
+      galera: 3
160
+      rabbitmq: 3
161
+    EOF
162
+
163
+This will sets the number of replicas to create for each service. We need 3
164
+replicas for galera and rabbitmq cluster.
165
+
153 166
 Fetch CCP components repos:
154 167
 
155 168
 ::
@@ -178,7 +191,7 @@ For example:
178 191
 
179 192
 ::
180 193
 
181
-    ccp deploy -c etcd mariadb keystone
194
+    ccp deploy -c etcd galera keystone memcached
182 195
 
183 196
 Check deploy status
184 197
 -------------------

+ 8
- 2
etc/topology-calico-example.yaml View File

@@ -1,13 +1,21 @@
1 1
 nodes:
2 2
   node1:
3 3
     roles:
4
+      - db
5
+      - messaging
4 6
       - controller
5 7
       - neutron-agents
6 8
   node[2-3]:
7 9
     roles:
10
+      - db
11
+      - messaging
8 12
       - compute
9 13
       - calico
10 14
 roles:
15
+  db:
16
+    - galera
17
+  messaging:
18
+    - rabbitmq
11 19
   controller:
12 20
     - etcd
13 21
     - glance-api
@@ -17,7 +25,6 @@ roles:
17 25
     - heat-engine
18 26
     - horizon
19 27
     - keystone
20
-    - mariadb
21 28
     - memcached
22 29
     - neutron-server
23 30
     - nova-api
@@ -25,7 +32,6 @@ roles:
25 32
     - nova-consoleauth
26 33
     - nova-novncproxy
27 34
     - nova-scheduler
28
-    - rabbitmq
29 35
   neutron-agents:
30 36
     - neutron-metadata-agent
31 37
   compute:

+ 8
- 2
etc/topology-example.yaml View File

@@ -1,13 +1,21 @@
1 1
 nodes:
2 2
   node1:
3 3
     roles:
4
+      - db
5
+      - messaging
4 6
       - controller
5 7
       - openvswitch
6 8
   node[2-3]:
7 9
     roles:
10
+      - db
11
+      - messaging
8 12
       - compute
9 13
       - openvswitch
10 14
 roles:
15
+  db:
16
+    - galera
17
+  messaging:
18
+    - rabbitmq
11 19
   controller:
12 20
     - etcd
13 21
     - glance-api
@@ -17,7 +25,6 @@ roles:
17 25
     - heat-engine
18 26
     - horizon
19 27
     - keystone
20
-    - mariadb
21 28
     - memcached
22 29
     - neutron-dhcp-agent
23 30
     - neutron-l3-agent
@@ -28,7 +35,6 @@ roles:
28 35
     - nova-consoleauth
29 36
     - nova-novncproxy
30 37
     - nova-scheduler
31
-    - rabbitmq
32 38
   compute:
33 39
     - nova-compute
34 40
     - nova-libvirt

+ 8
- 2
etc/topology-with-ceph-example.yaml View File

@@ -1,13 +1,21 @@
1 1
 nodes:
2 2
   node1:
3 3
     roles:
4
+      - db
5
+      - messaging
4 6
       - controller
5 7
       - openvswitch
6 8
   node[2-3]:
7 9
     roles:
10
+      - db
11
+      - messaging
8 12
       - compute
9 13
       - openvswitch
10 14
 roles:
15
+  db:
16
+    - galera
17
+  messaging:
18
+    - rabbitmq
11 19
   controller:
12 20
     - etcd
13 21
     - glance-api
@@ -17,7 +25,6 @@ roles:
17 25
     - heat-engine
18 26
     - horizon
19 27
     - keystone
20
-    - mariadb
21 28
     - memcached
22 29
     - neutron-dhcp-agent
23 30
     - neutron-l3-agent
@@ -28,7 +35,6 @@ roles:
28 35
     - nova-consoleauth
29 36
     - nova-novncproxy
30 37
     - nova-scheduler
31
-    - rabbitmq
32 38
     - cinder-scheduler
33 39
     - cinder-api
34 40
     - cinder-volume

+ 7
- 3
etc/topology-with-large-number-of-nodes.yaml View File

@@ -1,6 +1,8 @@
1 1
 nodes:
2 2
   node[1-3]$:
3 3
     roles:
4
+      - db
5
+      - messaging
4 6
       - controller
5 7
       - openvswitch
6 8
   node([4-9]|10|11|12)$:
@@ -8,6 +10,10 @@ nodes:
8 10
       - compute
9 11
       - openvswitch
10 12
 roles:
13
+  db:
14
+    - galera
15
+  messaging:
16
+    - rabbitmq
11 17
   controller:
12 18
     - etcd
13 19
     - glance-api
@@ -17,7 +23,6 @@ roles:
17 23
     - heat-engine
18 24
     - horizon
19 25
     - keystone
20
-    - mariadb
21 26
     - memcached
22 27
     - neutron-dhcp-agent
23 28
     - neutron-l3-agent
@@ -28,11 +33,10 @@ roles:
28 33
     - nova-consoleauth
29 34
     - nova-novncproxy
30 35
     - nova-scheduler
31
-    - rabbitmq
32 36
   compute:
33 37
     - nova-compute
34 38
     - nova-libvirt
35 39
   openvswitch:
36 40
     - neutron-openvswitch-agent
37 41
     - openvswitch-db
38
-    - openvswitch-vswitchd
42
+    - openvswitch-vswitchd

+ 8
- 2
etc/topology-with-stacklight-example.yaml View File

@@ -7,16 +7,24 @@
7 7
 nodes:
8 8
   node1:
9 9
     roles:
10
+      - db
11
+      - messaging
10 12
       - controller
11 13
       - stacklight-collector
12 14
       - stacklight-backend
13 15
       - openvswitch
14 16
   node[2-3]:
15 17
     roles:
18
+      - db
19
+      - messaging
16 20
       - compute
17 21
       - stacklight-collector
18 22
       - openvswitch
19 23
 roles:
24
+  db:
25
+    - galera
26
+  messaging:
27
+    - rabbitmq
20 28
   controller:
21 29
     - etcd
22 30
     - glance-api
@@ -26,7 +34,6 @@ roles:
26 34
     - heat-engine
27 35
     - horizon
28 36
     - keystone
29
-    - mariadb
30 37
     - memcached
31 38
     - neutron-dhcp-agent
32 39
     - neutron-l3-agent
@@ -37,7 +44,6 @@ roles:
37 44
     - nova-consoleauth
38 45
     - nova-novncproxy
39 46
     - nova-scheduler
40
-    - rabbitmq
41 47
   compute:
42 48
     - nova-compute
43 49
     - nova-libvirt

+ 1
- 1
fuel_ccp/config/repositories.py View File

@@ -7,13 +7,13 @@ DEFAULT_REPOS = [
7 7
     'fuel-ccp-debian-base',
8 8
     'fuel-ccp-entrypoint',
9 9
     'fuel-ccp-etcd',
10
+    'fuel-ccp-galera',
10 11
     'fuel-ccp-glance',
11 12
     'fuel-ccp-grafana',
12 13
     'fuel-ccp-heat',
13 14
     'fuel-ccp-horizon',
14 15
     'fuel-ccp-ironic',
15 16
     'fuel-ccp-keystone',
16
-    'fuel-ccp-mariadb',
17 17
     'fuel-ccp-memcached',
18 18
     'fuel-ccp-murano',
19 19
     'fuel-ccp-neutron',

+ 2
- 2
fuel_ccp/tests/common/service-rendered-example-custom.yaml View File

@@ -19,10 +19,10 @@ service:
19 19
           command: "sudo /bin/chown keystone:keystone /var/log/ccp/keystone"
20 20
         - name: keystone-db-create
21 21
           dependencies:
22
-            - mariadb
22
+            - galera
23 23
           type: single
24 24
           command:
25
-            mysql -u root -pdb_root_password_custom -h mariadb -e "create database keystone_db_name_custom;
25
+            mysql -u root -pdb_root_password_custom -h galera -e "create database keystone_db_name_custom;
26 26
             grant all privileges on keystone_db_name_custom.* to 'keystone_db_username_custom'@'%' identified by 'keystone_db_password_custom'"
27 27
         - name: keystone-db-sync
28 28
           files:

+ 2
- 2
fuel_ccp/tests/common/service-rendered-example-default.yaml View File

@@ -19,10 +19,10 @@ service:
19 19
           command: "sudo /bin/chown keystone:keystone /var/log/ccp/keystone"
20 20
         - name: keystone-db-create
21 21
           dependencies:
22
-            - mariadb
22
+            - galera
23 23
           type: single
24 24
           command:
25
-            mysql -u root -pdb_root_password_default -h mariadb -e "create database keystone_db_name_default;
25
+            mysql -u root -pdb_root_password_default -h galera -e "create database keystone_db_name_default;
26 26
             grant all privileges on keystone_db_name_default.* to 'keystone_db_username_default'@'%' identified by 'keystone_db_password_default'"
27 27
         - name: keystone-db-sync
28 28
           files:

+ 2
- 2
fuel_ccp/tests/common/test_repo_dir/component/service/service-example.yaml View File

@@ -20,10 +20,10 @@ service:
20 20
           command: "sudo /bin/chown {{ service_name }}:{{ service_name }} /var/log/ccp/{{ service_name }}"
21 21
         - name: {{ service_name }}-db-create
22 22
           dependencies:
23
-            - mariadb
23
+            - galera
24 24
           type: single
25 25
           command:
26
-            mysql -u root -p{{ db_root_password }} -h mariadb -e "create database {{ keystone_db_name }};
26
+            mysql -u root -p{{ db_root_password }} -h galera -e "create database {{ keystone_db_name }};
27 27
             grant all privileges on {{ keystone_db_name }}.* to '{{ keystone_db_username }}'@'%' identified by '{{ keystone_db_password }}'"
28 28
         - name: {{ service_name }}-db-sync
29 29
           files:

+ 1
- 1
fuel_ccp/tests/test_build.py View File

@@ -194,7 +194,7 @@ class TestBuild(base.TestCase):
194 194
 
195 195
     def test_match_not_ready_base_dockerfiles(self):
196 196
         dockerfile = {
197
-            'name': 'mariadb',
197
+            'name': 'galera',
198 198
             'match': True,
199 199
             'parent': {
200 200
                 'name': 'base-tools',

Loading…
Cancel
Save