x
/
fuel-ccp
Code Issues Proposed changes

Merge "Enable Galera as a default DB"

This commit is contained in:
Jenkins 2017-02-15 12:13:07 +00:00 committed by Gerrit Code Review
parent 6e39888989 b7520afcda
commit 5aa10c9cb1
11 changed files with 61 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/source/quickstart.rst
View File

@ -150,6 +150,19 @@ your environment may be different.
For the additional info about bootstrapping configuration please read the
:doc:`bootstrapping`.
Append replicas configuration:
::
cat >> ~/.ccp.yaml << EOF
replicas:
galera: 3
rabbitmq: 3
EOF
This will sets the number of replicas to create for each service. We need 3
replicas for galera and rabbitmq cluster.
Fetch CCP components repos:
::
@ -178,7 +191,7 @@ For example:
::
ccp deploy -c etcd mariadb keystone
ccp deploy -c etcd galera keystone memcached
Check deploy status
-------------------

10
etc/topology-calico-example.yaml
View File

@ -1,13 +1,21 @@
nodes:
node1:
roles:
- db
- messaging
- controller
- neutron-agents
node[2-3]:
roles:
- db
- messaging
- compute
- calico
roles:
db:
- galera
messaging:
- rabbitmq
controller:
- etcd
- glance-api
@ -17,7 +25,6 @@ roles:
- heat-engine
- horizon
- keystone
- mariadb
- memcached
- neutron-server
- nova-api
@ -25,7 +32,6 @@ roles:
- nova-consoleauth
- nova-novncproxy
- nova-scheduler
- rabbitmq
neutron-agents:
- neutron-metadata-agent
compute:

10
etc/topology-example.yaml
View File

@ -1,13 +1,21 @@
nodes:
node1:
roles:
- db
- messaging
- controller
- openvswitch
node[2-3]:
roles:
- db
- messaging
- compute
- openvswitch
roles:
db:
- galera
messaging:
- rabbitmq
controller:
- etcd
- glance-api
@ -17,7 +25,6 @@ roles:
- heat-engine
- horizon
- keystone
- mariadb
- memcached
- neutron-dhcp-agent
- neutron-l3-agent
@ -28,7 +35,6 @@ roles:
- nova-consoleauth
- nova-novncproxy
- nova-scheduler
- rabbitmq
compute:
- nova-compute
- nova-libvirt

10
etc/topology-with-ceph-example.yaml
View File

@ -1,13 +1,21 @@
nodes:
node1:
roles:
- db
- messaging
- controller
- openvswitch
node[2-3]:
roles:
- db
- messaging
- compute
- openvswitch
roles:
db:
- galera
messaging:
- rabbitmq
controller:
- etcd
- glance-api
@ -17,7 +25,6 @@ roles:
- heat-engine
- horizon
- keystone
- mariadb
- memcached
- neutron-dhcp-agent
- neutron-l3-agent
@ -28,7 +35,6 @@ roles:
- nova-consoleauth
- nova-novncproxy
- nova-scheduler
- rabbitmq
- cinder-scheduler
- cinder-api
- cinder-volume

10
etc/topology-with-large-number-of-nodes.yaml
View File

@ -1,6 +1,8 @@
nodes:
node[1-3]$:
roles:
- db
- messaging
- controller
- openvswitch
node([4-9]|10|11|12)$:
@ -8,6 +10,10 @@ nodes:
- compute
- openvswitch
roles:
db:
- galera
messaging:
- rabbitmq
controller:
- etcd
- glance-api
@ -17,7 +23,6 @@ roles:
- heat-engine
- horizon
- keystone
- mariadb
- memcached
- neutron-dhcp-agent
- neutron-l3-agent
@ -28,11 +33,10 @@ roles:
- nova-consoleauth
- nova-novncproxy
- nova-scheduler
- rabbitmq
compute:
- nova-compute
- nova-libvirt
openvswitch:
- neutron-openvswitch-agent
- openvswitch-db
- openvswitch-vswitchd
- openvswitch-vswitchd

10
etc/topology-with-stacklight-example.yaml
View File

@ -7,16 +7,24 @@
nodes:
node1:
roles:
- db
- messaging
- controller
- stacklight-collector
- stacklight-backend
- openvswitch
node[2-3]:
roles:
- db
- messaging
- compute
- stacklight-collector
- openvswitch
roles:
db:
- galera
messaging:
- rabbitmq
controller:
- etcd
- glance-api
@ -26,7 +34,6 @@ roles:
- heat-engine
- horizon
- keystone
- mariadb
- memcached
- neutron-dhcp-agent
- neutron-l3-agent
@ -37,7 +44,6 @@ roles:
- nova-consoleauth
- nova-novncproxy
- nova-scheduler
- rabbitmq
compute:
- nova-compute
- nova-libvirt

2
fuel_ccp/config/repositories.py
View File

@ -7,13 +7,13 @@ DEFAULT_REPOS = [
'fuel-ccp-debian-base',
'fuel-ccp-entrypoint',
'fuel-ccp-etcd',
'fuel-ccp-galera',
'fuel-ccp-glance',
'fuel-ccp-grafana',
'fuel-ccp-heat',
'fuel-ccp-horizon',
'fuel-ccp-ironic',
'fuel-ccp-keystone',
'fuel-ccp-mariadb',
'fuel-ccp-memcached',
'fuel-ccp-murano',
'fuel-ccp-neutron',

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

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

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

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

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

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

2
fuel_ccp/tests/test_build.py
View File

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