Enable Galera as a default DB
Additionaly I have to updates all topology and docs to address this change. And yes, I propose to deploy 3 rabbitmq too. Change-Id: I9db9fcb7a5f78312dabc23ed2ff56cb0a9748f4d
This commit is contained in:
parent
35b7e1f5a7
commit
b7520afcda
|
@ -150,6 +150,19 @@ your environment may be different.
|
||||||
For the additional info about bootstrapping configuration please read the
|
For the additional info about bootstrapping configuration please read the
|
||||||
:doc:`bootstrapping`.
|
: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:
|
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
|
Check deploy status
|
||||||
-------------------
|
-------------------
|
||||||
|
|
|
@ -1,13 +1,21 @@
|
||||||
nodes:
|
nodes:
|
||||||
node1:
|
node1:
|
||||||
roles:
|
roles:
|
||||||
|
- db
|
||||||
|
- messaging
|
||||||
- controller
|
- controller
|
||||||
- neutron-agents
|
- neutron-agents
|
||||||
node[2-3]:
|
node[2-3]:
|
||||||
roles:
|
roles:
|
||||||
|
- db
|
||||||
|
- messaging
|
||||||
- compute
|
- compute
|
||||||
- calico
|
- calico
|
||||||
roles:
|
roles:
|
||||||
|
db:
|
||||||
|
- galera
|
||||||
|
messaging:
|
||||||
|
- rabbitmq
|
||||||
controller:
|
controller:
|
||||||
- etcd
|
- etcd
|
||||||
- glance-api
|
- glance-api
|
||||||
|
@ -17,7 +25,6 @@ roles:
|
||||||
- heat-engine
|
- heat-engine
|
||||||
- horizon
|
- horizon
|
||||||
- keystone
|
- keystone
|
||||||
- mariadb
|
|
||||||
- memcached
|
- memcached
|
||||||
- neutron-server
|
- neutron-server
|
||||||
- nova-api
|
- nova-api
|
||||||
|
@ -25,7 +32,6 @@ roles:
|
||||||
- nova-consoleauth
|
- nova-consoleauth
|
||||||
- nova-novncproxy
|
- nova-novncproxy
|
||||||
- nova-scheduler
|
- nova-scheduler
|
||||||
- rabbitmq
|
|
||||||
neutron-agents:
|
neutron-agents:
|
||||||
- neutron-metadata-agent
|
- neutron-metadata-agent
|
||||||
compute:
|
compute:
|
||||||
|
|
|
@ -1,13 +1,21 @@
|
||||||
nodes:
|
nodes:
|
||||||
node1:
|
node1:
|
||||||
roles:
|
roles:
|
||||||
|
- db
|
||||||
|
- messaging
|
||||||
- controller
|
- controller
|
||||||
- openvswitch
|
- openvswitch
|
||||||
node[2-3]:
|
node[2-3]:
|
||||||
roles:
|
roles:
|
||||||
|
- db
|
||||||
|
- messaging
|
||||||
- compute
|
- compute
|
||||||
- openvswitch
|
- openvswitch
|
||||||
roles:
|
roles:
|
||||||
|
db:
|
||||||
|
- galera
|
||||||
|
messaging:
|
||||||
|
- rabbitmq
|
||||||
controller:
|
controller:
|
||||||
- etcd
|
- etcd
|
||||||
- glance-api
|
- glance-api
|
||||||
|
@ -17,7 +25,6 @@ roles:
|
||||||
- heat-engine
|
- heat-engine
|
||||||
- horizon
|
- horizon
|
||||||
- keystone
|
- keystone
|
||||||
- mariadb
|
|
||||||
- memcached
|
- memcached
|
||||||
- neutron-dhcp-agent
|
- neutron-dhcp-agent
|
||||||
- neutron-l3-agent
|
- neutron-l3-agent
|
||||||
|
@ -28,7 +35,6 @@ roles:
|
||||||
- nova-consoleauth
|
- nova-consoleauth
|
||||||
- nova-novncproxy
|
- nova-novncproxy
|
||||||
- nova-scheduler
|
- nova-scheduler
|
||||||
- rabbitmq
|
|
||||||
compute:
|
compute:
|
||||||
- nova-compute
|
- nova-compute
|
||||||
- nova-libvirt
|
- nova-libvirt
|
||||||
|
|
|
@ -1,13 +1,21 @@
|
||||||
nodes:
|
nodes:
|
||||||
node1:
|
node1:
|
||||||
roles:
|
roles:
|
||||||
|
- db
|
||||||
|
- messaging
|
||||||
- controller
|
- controller
|
||||||
- openvswitch
|
- openvswitch
|
||||||
node[2-3]:
|
node[2-3]:
|
||||||
roles:
|
roles:
|
||||||
|
- db
|
||||||
|
- messaging
|
||||||
- compute
|
- compute
|
||||||
- openvswitch
|
- openvswitch
|
||||||
roles:
|
roles:
|
||||||
|
db:
|
||||||
|
- galera
|
||||||
|
messaging:
|
||||||
|
- rabbitmq
|
||||||
controller:
|
controller:
|
||||||
- etcd
|
- etcd
|
||||||
- glance-api
|
- glance-api
|
||||||
|
@ -17,7 +25,6 @@ roles:
|
||||||
- heat-engine
|
- heat-engine
|
||||||
- horizon
|
- horizon
|
||||||
- keystone
|
- keystone
|
||||||
- mariadb
|
|
||||||
- memcached
|
- memcached
|
||||||
- neutron-dhcp-agent
|
- neutron-dhcp-agent
|
||||||
- neutron-l3-agent
|
- neutron-l3-agent
|
||||||
|
@ -28,7 +35,6 @@ roles:
|
||||||
- nova-consoleauth
|
- nova-consoleauth
|
||||||
- nova-novncproxy
|
- nova-novncproxy
|
||||||
- nova-scheduler
|
- nova-scheduler
|
||||||
- rabbitmq
|
|
||||||
- cinder-scheduler
|
- cinder-scheduler
|
||||||
- cinder-api
|
- cinder-api
|
||||||
- cinder-volume
|
- cinder-volume
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
nodes:
|
nodes:
|
||||||
node[1-3]$:
|
node[1-3]$:
|
||||||
roles:
|
roles:
|
||||||
|
- db
|
||||||
|
- messaging
|
||||||
- controller
|
- controller
|
||||||
- openvswitch
|
- openvswitch
|
||||||
node([4-9]|10|11|12)$:
|
node([4-9]|10|11|12)$:
|
||||||
|
@ -8,6 +10,10 @@ nodes:
|
||||||
- compute
|
- compute
|
||||||
- openvswitch
|
- openvswitch
|
||||||
roles:
|
roles:
|
||||||
|
db:
|
||||||
|
- galera
|
||||||
|
messaging:
|
||||||
|
- rabbitmq
|
||||||
controller:
|
controller:
|
||||||
- etcd
|
- etcd
|
||||||
- glance-api
|
- glance-api
|
||||||
|
@ -17,7 +23,6 @@ roles:
|
||||||
- heat-engine
|
- heat-engine
|
||||||
- horizon
|
- horizon
|
||||||
- keystone
|
- keystone
|
||||||
- mariadb
|
|
||||||
- memcached
|
- memcached
|
||||||
- neutron-dhcp-agent
|
- neutron-dhcp-agent
|
||||||
- neutron-l3-agent
|
- neutron-l3-agent
|
||||||
|
@ -28,11 +33,10 @@ roles:
|
||||||
- nova-consoleauth
|
- nova-consoleauth
|
||||||
- nova-novncproxy
|
- nova-novncproxy
|
||||||
- nova-scheduler
|
- nova-scheduler
|
||||||
- rabbitmq
|
|
||||||
compute:
|
compute:
|
||||||
- nova-compute
|
- nova-compute
|
||||||
- nova-libvirt
|
- nova-libvirt
|
||||||
openvswitch:
|
openvswitch:
|
||||||
- neutron-openvswitch-agent
|
- neutron-openvswitch-agent
|
||||||
- openvswitch-db
|
- openvswitch-db
|
||||||
- openvswitch-vswitchd
|
- openvswitch-vswitchd
|
||||||
|
|
|
@ -7,16 +7,24 @@
|
||||||
nodes:
|
nodes:
|
||||||
node1:
|
node1:
|
||||||
roles:
|
roles:
|
||||||
|
- db
|
||||||
|
- messaging
|
||||||
- controller
|
- controller
|
||||||
- stacklight-collector
|
- stacklight-collector
|
||||||
- stacklight-backend
|
- stacklight-backend
|
||||||
- openvswitch
|
- openvswitch
|
||||||
node[2-3]:
|
node[2-3]:
|
||||||
roles:
|
roles:
|
||||||
|
- db
|
||||||
|
- messaging
|
||||||
- compute
|
- compute
|
||||||
- stacklight-collector
|
- stacklight-collector
|
||||||
- openvswitch
|
- openvswitch
|
||||||
roles:
|
roles:
|
||||||
|
db:
|
||||||
|
- galera
|
||||||
|
messaging:
|
||||||
|
- rabbitmq
|
||||||
controller:
|
controller:
|
||||||
- etcd
|
- etcd
|
||||||
- glance-api
|
- glance-api
|
||||||
|
@ -26,7 +34,6 @@ roles:
|
||||||
- heat-engine
|
- heat-engine
|
||||||
- horizon
|
- horizon
|
||||||
- keystone
|
- keystone
|
||||||
- mariadb
|
|
||||||
- memcached
|
- memcached
|
||||||
- neutron-dhcp-agent
|
- neutron-dhcp-agent
|
||||||
- neutron-l3-agent
|
- neutron-l3-agent
|
||||||
|
@ -37,7 +44,6 @@ roles:
|
||||||
- nova-consoleauth
|
- nova-consoleauth
|
||||||
- nova-novncproxy
|
- nova-novncproxy
|
||||||
- nova-scheduler
|
- nova-scheduler
|
||||||
- rabbitmq
|
|
||||||
compute:
|
compute:
|
||||||
- nova-compute
|
- nova-compute
|
||||||
- nova-libvirt
|
- nova-libvirt
|
||||||
|
|
|
@ -7,13 +7,13 @@ DEFAULT_REPOS = [
|
||||||
'fuel-ccp-debian-base',
|
'fuel-ccp-debian-base',
|
||||||
'fuel-ccp-entrypoint',
|
'fuel-ccp-entrypoint',
|
||||||
'fuel-ccp-etcd',
|
'fuel-ccp-etcd',
|
||||||
|
'fuel-ccp-galera',
|
||||||
'fuel-ccp-glance',
|
'fuel-ccp-glance',
|
||||||
'fuel-ccp-grafana',
|
'fuel-ccp-grafana',
|
||||||
'fuel-ccp-heat',
|
'fuel-ccp-heat',
|
||||||
'fuel-ccp-horizon',
|
'fuel-ccp-horizon',
|
||||||
'fuel-ccp-ironic',
|
'fuel-ccp-ironic',
|
||||||
'fuel-ccp-keystone',
|
'fuel-ccp-keystone',
|
||||||
'fuel-ccp-mariadb',
|
|
||||||
'fuel-ccp-memcached',
|
'fuel-ccp-memcached',
|
||||||
'fuel-ccp-murano',
|
'fuel-ccp-murano',
|
||||||
'fuel-ccp-neutron',
|
'fuel-ccp-neutron',
|
||||||
|
|
|
@ -19,10 +19,10 @@ service:
|
||||||
command: "sudo /bin/chown keystone:keystone /var/log/ccp/keystone"
|
command: "sudo /bin/chown keystone:keystone /var/log/ccp/keystone"
|
||||||
- name: keystone-db-create
|
- name: keystone-db-create
|
||||||
dependencies:
|
dependencies:
|
||||||
- mariadb
|
- galera
|
||||||
type: single
|
type: single
|
||||||
command:
|
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'"
|
grant all privileges on keystone_db_name_custom.* to 'keystone_db_username_custom'@'%' identified by 'keystone_db_password_custom'"
|
||||||
- name: keystone-db-sync
|
- name: keystone-db-sync
|
||||||
files:
|
files:
|
||||||
|
|
|
@ -19,10 +19,10 @@ service:
|
||||||
command: "sudo /bin/chown keystone:keystone /var/log/ccp/keystone"
|
command: "sudo /bin/chown keystone:keystone /var/log/ccp/keystone"
|
||||||
- name: keystone-db-create
|
- name: keystone-db-create
|
||||||
dependencies:
|
dependencies:
|
||||||
- mariadb
|
- galera
|
||||||
type: single
|
type: single
|
||||||
command:
|
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'"
|
grant all privileges on keystone_db_name_default.* to 'keystone_db_username_default'@'%' identified by 'keystone_db_password_default'"
|
||||||
- name: keystone-db-sync
|
- name: keystone-db-sync
|
||||||
files:
|
files:
|
||||||
|
|
|
@ -20,10 +20,10 @@ service:
|
||||||
command: "sudo /bin/chown {{ service_name }}:{{ service_name }} /var/log/ccp/{{ service_name }}"
|
command: "sudo /bin/chown {{ service_name }}:{{ service_name }} /var/log/ccp/{{ service_name }}"
|
||||||
- name: {{ service_name }}-db-create
|
- name: {{ service_name }}-db-create
|
||||||
dependencies:
|
dependencies:
|
||||||
- mariadb
|
- galera
|
||||||
type: single
|
type: single
|
||||||
command:
|
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 }}'"
|
grant all privileges on {{ keystone_db_name }}.* to '{{ keystone_db_username }}'@'%' identified by '{{ keystone_db_password }}'"
|
||||||
- name: {{ service_name }}-db-sync
|
- name: {{ service_name }}-db-sync
|
||||||
files:
|
files:
|
||||||
|
|
|
@ -194,7 +194,7 @@ class TestBuild(base.TestCase):
|
||||||
|
|
||||||
def test_match_not_ready_base_dockerfiles(self):
|
def test_match_not_ready_base_dockerfiles(self):
|
||||||
dockerfile = {
|
dockerfile = {
|
||||||
'name': 'mariadb',
|
'name': 'galera',
|
||||||
'match': True,
|
'match': True,
|
||||||
'parent': {
|
'parent': {
|
||||||
'name': 'base-tools',
|
'name': 'base-tools',
|
||||||
|
|
Loading…
Reference in New Issue