x
/
fuel-ccp
Code Issues Proposed changes

Merge "Change multideployment script to use galera"

This commit is contained in:
Jenkins 2017-02-22 14:40:45 +00:00 committed by Gerrit Code Review
parent 980412c95f 377fb11ea6
commit 5c6e2fd998
6 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/ccp-multi-deploy/config/ccp-configs-common.yaml
View File

@ -8,6 +8,9 @@ builder:
registry: registry:
address: "127.0.0.1:31500" address: "127.0.0.1:31500"
timeout: 1500 timeout: 1500
replicas:
galera: 3
rabbitmq: 3
repositories: repositories:
path: /tmp/ccp-repos path: /tmp/ccp-repos
skip_empty: True skip_empty: True
@ -19,6 +22,8 @@ repositories:
name: entrypoint name: entrypoint
- git_url: https://git.openstack.org/openstack/fuel-ccp-etcd - git_url: https://git.openstack.org/openstack/fuel-ccp-etcd
name: 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 - git_url: https://git.openstack.org/openstack/fuel-ccp-glance
name: glance name: glance
- git_url: https://git.openstack.org/openstack/fuel-ccp-heat - git_url: https://git.openstack.org/openstack/fuel-ccp-heat
@ -27,8 +32,6 @@ repositories:
name: horizon name: horizon
- git_url: https://git.openstack.org/openstack/fuel-ccp-keystone - git_url: https://git.openstack.org/openstack/fuel-ccp-keystone
name: 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 - git_url: https://git.openstack.org/openstack/fuel-ccp-memcached
name: memcached name: memcached
- git_url: https://git.openstack.org/openstack/fuel-ccp-neutron - git_url: https://git.openstack.org/openstack/fuel-ccp-neutron

5
tools/ccp-multi-deploy/config/ccp-roles.yaml
View File

@ -1,5 +1,9 @@
--- ---
roles: roles:
db:
- galera
messaging:
- rabbitmq
controller-net-host: controller-net-host:
- neutron-dhcp-agent - neutron-dhcp-agent
- neutron-l3-agent - neutron-l3-agent
@ -13,7 +17,6 @@ roles:
- heat-engine - heat-engine
- horizon - horizon
- keystone - keystone
- mariadb
- memcached - memcached
- neutron-server - neutron-server
- nova-api - nova-api

4
tools/ccp-multi-deploy/config/ccp-topology-1.yaml
View File

@ -5,9 +5,13 @@ nodes:
- controller-net-bridge - controller-net-bridge
node1: node1:
roles: roles:
- db
- messaging
- openvswitch - openvswitch
- controller-net-host - controller-net-host
node[2-3]: node[2-3]:
roles: roles:
- db
- messaging
- openvswitch - openvswitch
- compute - compute

4
tools/ccp-multi-deploy/config/ccp-topology-2.yaml
View File

@ -5,9 +5,13 @@ nodes:
- controller-net-bridge - controller-net-bridge
node4: node4:
roles: roles:
- db
- messaging
- openvswitch - openvswitch
- controller-net-host - controller-net-host
node[5-6]: node[5-6]:
roles: roles:
- db
- messaging
- openvswitch - openvswitch
- compute - compute

4
tools/ccp-multi-deploy/config/ccp-topology-3.yaml
View File

@ -5,9 +5,13 @@ nodes:
- controller-net-bridge - controller-net-bridge
node7: node7:
roles: roles:
- db
- messaging
- openvswitch - openvswitch
- controller-net-host - controller-net-host
node[8-9]: node[8-9]:
roles: roles:
- db
- messaging
- openvswitch - openvswitch
- compute - compute

12
tools/ccp-multi-deploy/config/multiple-deployments-topology.yaml
View File

@ -6,26 +6,38 @@
node1: node1:
- db[1]
- messaging[1]
- openvswitch[1] - openvswitch[1]
- controller-net-host[1] - controller-net-host[1]
- controller-net-bridge[.*] - controller-net-bridge[.*]
node[2-3] node[2-3]
- db[1]
- messaging[1]
- openvswitch[1] - openvswitch[1]
- compute[1] - compute[1]
- controller-net-bridge[.*] - controller-net-bridge[.*]
node4: node4:
- db[2]
- messaging[2]
- openvswitch[2] - openvswitch[2]
- controller-net-host[2] - controller-net-host[2]
- controller-net-bridge[.*] - controller-net-bridge[.*]
node[5-6] node[5-6]
- db[2]
- messaging[2]
- openvswitch[2] - openvswitch[2]
- compute[2] - compute[2]
- controller-net-bridge[.*] - controller-net-bridge[.*]
node7: node7:
- db[3]
- messaging[3]
- openvswitch[3] - openvswitch[3]
- controller-net-host[3] - controller-net-host[3]
- controller-net-bridge[.*] - controller-net-bridge[.*]
node[8-9]: node[8-9]:
- db[3]
- messaging[3]
- openvswitch[3] - openvswitch[3]
- compute[3] - compute[3]
- controller-net-bridge[.*] - controller-net-bridge[.*]