Compare commits

...

2 Commits

2 changed files with 4 additions and 12 deletions

View File

@ -101,11 +101,11 @@ pvc_routers:
pvc_cluster_device: "eth0" pvc_cluster_device: "eth0"
pvc_cluster_domain: "pvc.local" pvc_cluster_domain: "pvc.local"
pvc_cluster_subnet: "10.0.0.0/24" pvc_cluster_subnet: "10.0.0.0/24"
pvc_cluster_floatingip: "10.0.0.251/24" pvc_cluster_floatingip: "10.0.0.251"
pvc_storage_device: "eth1" pvc_storage_device: "eth1"
pvc_storage_domain: "pvc.storage" pvc_storage_domain: "pvc.storage"
pvc_storage_subnet: "10.0.1.0/24" pvc_storage_subnet: "10.0.1.0/24"
pvc_storage_floatingip: "10.0.1.251/24" pvc_storage_floatingip: "10.0.1.251"
pvc_upstream_device: "eth2" pvc_upstream_device: "eth2"
pvc_upstream_domain: "" pvc_upstream_domain: ""
pvc_upstream_subnet: "" pvc_upstream_subnet: ""

View File

@ -45,8 +45,8 @@ pvc:
provisioner: provisioner:
# database: Backend database configuration # database: Backend database configuration
database: database:
# host: PostgreSQL hostname, usually 'localhost' # host: PostgreSQL hostname, the primary coordinator floating IP in the cluster network
host: localhost host: {{ pvc_cluster_floatingip }}
# port: PostgreSQL port, invariably '5432' # port: PostgreSQL port, invariably '5432'
port: 5432 port: 5432
# name: PostgreSQL database name, invariably 'pvcapi' # name: PostgreSQL database name, invariably 'pvcapi'
@ -55,14 +55,6 @@ pvc:
user: {{ pvc_api_database_user }} user: {{ pvc_api_database_user }}
# pass: PostgreSQL user password, randomly generated # pass: PostgreSQL user password, randomly generated
pass: {{ pvc_api_database_password }} pass: {{ pvc_api_database_password }}
# queue: Celery backend queue using the PVC Zookeeper cluster
queue:
# host: Redis hostname, usually 'localhost'
host: localhost
# port: Redis port, invariably '6279'
port: 6379
# path: Redis queue path, invariably '/0'
path: /0
# ceph_cluster: Information about the Ceph storage cluster # ceph_cluster: Information about the Ceph storage cluster
ceph_cluster: ceph_cluster:
# storage_hosts: The list of hosts that the Ceph monitors are valid on; if empty (the default), # storage_hosts: The list of hosts that the Ceph monitors are valid on; if empty (the default),