Adjust example configs to per-service configuration
Change-Id: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
This commit is contained in:
parent
5e07dad8fe
commit
a5083dc520
|
@ -1,3 +1,10 @@
|
|||
services:
|
||||
database:
|
||||
service_def: galera
|
||||
rpc:
|
||||
service_def: rabbitmq
|
||||
notifications:
|
||||
service_def: rabbitmq
|
||||
nodes:
|
||||
node1:
|
||||
roles:
|
||||
|
@ -13,9 +20,10 @@ nodes:
|
|||
- calico
|
||||
roles:
|
||||
db:
|
||||
- galera
|
||||
- database
|
||||
messaging:
|
||||
- rabbitmq
|
||||
- rpc
|
||||
- notifications
|
||||
controller:
|
||||
- etcd
|
||||
- glance-api
|
||||
|
|
|
@ -1,3 +1,10 @@
|
|||
services:
|
||||
database:
|
||||
service_def: galera
|
||||
rpc:
|
||||
service_def: rabbitmq
|
||||
notifications:
|
||||
service_def: rabbitmq
|
||||
nodes:
|
||||
node1:
|
||||
roles:
|
||||
|
@ -13,9 +20,10 @@ nodes:
|
|||
- openvswitch
|
||||
roles:
|
||||
db:
|
||||
- galera
|
||||
- database
|
||||
messaging:
|
||||
- rabbitmq
|
||||
- rpc
|
||||
- notifications
|
||||
controller:
|
||||
- etcd
|
||||
- glance-api
|
||||
|
|
|
@ -1,3 +1,10 @@
|
|||
services:
|
||||
database:
|
||||
service_def: galera
|
||||
rpc:
|
||||
service_def: rabbitmq
|
||||
notifications:
|
||||
service_def: rabbitmq
|
||||
nodes:
|
||||
node1:
|
||||
roles:
|
||||
|
@ -14,9 +21,10 @@ nodes:
|
|||
- openvswitch
|
||||
roles:
|
||||
db:
|
||||
- galera
|
||||
- database
|
||||
messaging:
|
||||
- rabbitmq
|
||||
- rpc
|
||||
- notifications
|
||||
controller:
|
||||
- etcd
|
||||
- glance-api
|
||||
|
|
|
@ -1,3 +1,10 @@
|
|||
services:
|
||||
database:
|
||||
service_def: galera
|
||||
rpc:
|
||||
service_def: rabbitmq
|
||||
notifications:
|
||||
service_def: rabbitmq
|
||||
nodes:
|
||||
node1:
|
||||
roles:
|
||||
|
@ -13,9 +20,10 @@ nodes:
|
|||
- openvswitch
|
||||
roles:
|
||||
db:
|
||||
- galera
|
||||
- database
|
||||
messaging:
|
||||
- rabbitmq
|
||||
- rpc
|
||||
- notifications
|
||||
controller:
|
||||
- etcd
|
||||
- glance-api
|
||||
|
|
|
@ -1,3 +1,10 @@
|
|||
services:
|
||||
database:
|
||||
service_def: galera
|
||||
rpc:
|
||||
service_def: rabbitmq
|
||||
notifications:
|
||||
service_def: rabbitmq
|
||||
nodes:
|
||||
node[1-3]$:
|
||||
roles:
|
||||
|
@ -11,9 +18,10 @@ nodes:
|
|||
- openvswitch
|
||||
roles:
|
||||
db:
|
||||
- galera
|
||||
- database
|
||||
messaging:
|
||||
- rabbitmq
|
||||
- rpc
|
||||
- notifications
|
||||
controller:
|
||||
- etcd
|
||||
- glance-api
|
||||
|
|
|
@ -3,7 +3,13 @@
|
|||
# require Kubernetes 1.4 or higher. With this topology configuration and with
|
||||
# Kubernetes 1.3 the deployment will fail with an error indicating that
|
||||
# "spec.nodeName" is not supported by the downward API.
|
||||
|
||||
services:
|
||||
database:
|
||||
service_def: galera
|
||||
rpc:
|
||||
service_def: rabbitmq
|
||||
notifications:
|
||||
service_def: rabbitmq
|
||||
nodes:
|
||||
node1:
|
||||
roles:
|
||||
|
@ -22,9 +28,10 @@ nodes:
|
|||
- openvswitch
|
||||
roles:
|
||||
db:
|
||||
- galera
|
||||
- database
|
||||
messaging:
|
||||
- rabbitmq
|
||||
- rpc
|
||||
- notifications
|
||||
controller:
|
||||
- etcd
|
||||
- glance-api
|
||||
|
|
|
@ -9,8 +9,8 @@ registry:
|
|||
address: "127.0.0.1:31500"
|
||||
timeout: 1500
|
||||
replicas:
|
||||
galera: 3
|
||||
rabbitmq: 3
|
||||
database: 3
|
||||
rpc: 3
|
||||
repositories:
|
||||
path: /tmp/ccp-repos
|
||||
skip_empty: True
|
||||
|
@ -44,5 +44,7 @@ repositories:
|
|||
name: rabbitmq
|
||||
- git_url: https://git.openstack.org/openstack/fuel-ccp-ceph
|
||||
name: ceph
|
||||
- git_url: https://git.openstack.org/openstack/fuel-ccp-ironic
|
||||
name: ironic
|
||||
configs:
|
||||
private_interface: ens3
|
||||
|
|
|
@ -1,9 +1,17 @@
|
|||
---
|
||||
services:
|
||||
database:
|
||||
service_def: galera
|
||||
rpc:
|
||||
service_def: rabbitmq
|
||||
notifications:
|
||||
service_def: rabbitmq
|
||||
roles:
|
||||
db:
|
||||
- galera
|
||||
- database
|
||||
messaging:
|
||||
- rabbitmq
|
||||
- rpc
|
||||
- notifications
|
||||
controller-net-host:
|
||||
- neutron-dhcp-agent
|
||||
- neutron-l3-agent
|
||||
|
|
|
@ -11,6 +11,13 @@ tee "${CONFIG_FILE}" <<EOF
|
|||
debug: True
|
||||
repositories:
|
||||
path: "${WORKSPACE}"
|
||||
services:
|
||||
database:
|
||||
service_def: galera
|
||||
rpc:
|
||||
service_def: rabbitmq
|
||||
notifications:
|
||||
service_def: rabbitmq
|
||||
EOF
|
||||
|
||||
tox -e venv -- python "${MY_DIR}/run_cloner.py" "${CONFIG_FILE}" "${ZUUL_CLONER}" --cache-dir /opt/git git://git.openstack.org
|
||||
|
|
Loading…
Reference in New Issue