Code Review
/
releng-xci-scenarios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug fix: Correct the ips in the config
[releng-xci-scenarios.git]
/
scenarios
/
os-nosdn-nofeature
/
role
/
os-nosdn-nofeature
/
files
/
ha
/
openstack_user_config.yml
diff --git
a/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml
b/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml
index
1aaf84d
..
d412da9
100644
(file)
--- a/
scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml
+++ b/
scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature/files/ha/openstack_user_config.yml
@@
-77,18
+77,18
@@
shared-infra_hosts:
controller00:
ip: 172.29.236.11
controller01:
controller00:
ip: 172.29.236.11
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
controller02:
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
# repository (apt cache, python packages, etc)
repo-infra_hosts:
controller00:
ip: 172.29.236.11
controller01:
# repository (apt cache, python packages, etc)
repo-infra_hosts:
controller00:
ip: 172.29.236.11
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
controller02:
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
# load balancer
# Ideally the load balancer should not use the Infrastructure hosts.
# load balancer
# Ideally the load balancer should not use the Infrastructure hosts.
@@
-97,9
+97,9
@@
haproxy_hosts:
controller00:
ip: 172.29.236.11
controller01:
controller00:
ip: 172.29.236.11
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
controller02:
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
# rsyslog server
# log_hosts:
# rsyslog server
# log_hosts:
@@
-115,18
+115,18
@@
identity_hosts:
controller00:
ip: 172.29.236.11
controller01:
controller00:
ip: 172.29.236.11
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
controller02:
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
# cinder api services
storage-infra_hosts:
controller00:
ip: 172.29.236.11
controller01:
# cinder api services
storage-infra_hosts:
controller00:
ip: 172.29.236.11
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
controller02:
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
# glance
# The settings here are repeated for each infra host.
# glance
# The settings here are repeated for each infra host.
@@
-139,27
+139,27
@@
image_hosts:
container_vars:
limit_container_types: glance
glance_nfs_client:
container_vars:
limit_container_types: glance
glance_nfs_client:
- - server: "172.29.244.1
4
"
+ - server: "172.29.244.1
2
"
remote_path: "/images"
local_path: "/var/lib/glance/images"
type: "nfs"
options: "_netdev,auto"
controller01:
remote_path: "/images"
local_path: "/var/lib/glance/images"
type: "nfs"
options: "_netdev,auto"
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
container_vars:
limit_container_types: glance
glance_nfs_client:
container_vars:
limit_container_types: glance
glance_nfs_client:
- - server: "172.29.244.1
4
"
+ - server: "172.29.244.1
2
"
remote_path: "/images"
local_path: "/var/lib/glance/images"
type: "nfs"
options: "_netdev,auto"
controller02:
remote_path: "/images"
local_path: "/var/lib/glance/images"
type: "nfs"
options: "_netdev,auto"
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
container_vars:
limit_container_types: glance
glance_nfs_client:
container_vars:
limit_container_types: glance
glance_nfs_client:
- - server: "172.29.244.1
4
"
+ - server: "172.29.244.1
2
"
remote_path: "/images"
local_path: "/var/lib/glance/images"
type: "nfs"
remote_path: "/images"
local_path: "/var/lib/glance/images"
type: "nfs"
@@
-170,43
+170,43
@@
compute-infra_hosts:
controller00:
ip: 172.29.236.11
controller01:
controller00:
ip: 172.29.236.11
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
controller02:
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
# heat
orchestration_hosts:
controller00:
ip: 172.29.236.11
controller01:
# heat
orchestration_hosts:
controller00:
ip: 172.29.236.11
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
controller02:
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
# horizon
dashboard_hosts:
controller00:
ip: 172.29.236.11
controller01:
# horizon
dashboard_hosts:
controller00:
ip: 172.29.236.11
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
controller02:
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
# neutron server, agents (L3, etc)
network_hosts:
controller00:
ip: 172.29.236.11
controller01:
# neutron server, agents (L3, etc)
network_hosts:
controller00:
ip: 172.29.236.11
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
controller02:
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
# nova hypervisors
compute_hosts:
compute00:
# nova hypervisors
compute_hosts:
compute00:
- ip: 172.29.236.1
4
+ ip: 172.29.236.1
2
compute01:
compute01:
- ip: 172.29.236.1
5
+ ip: 172.29.236.1
3
# cinder volume hosts (NFS-backed)
# The settings here are repeated for each infra host.
# cinder volume hosts (NFS-backed)
# The settings here are repeated for each infra host.
@@
-225,10
+225,10
@@
storage_hosts:
nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
nfs_shares_config: /etc/cinder/nfs_shares
shares:
nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
nfs_shares_config: /etc/cinder/nfs_shares
shares:
- - ip: "172.29.244.1
4
"
+ - ip: "172.29.244.1
2
"
share: "/volumes"
controller01:
share: "/volumes"
controller01:
- ip: 172.29.236.1
2
+ ip: 172.29.236.1
4
container_vars:
cinder_backends:
limit_container_types: cinder_volume
container_vars:
cinder_backends:
limit_container_types: cinder_volume
@@
-238,10
+238,10
@@
storage_hosts:
nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
nfs_shares_config: /etc/cinder/nfs_shares
shares:
nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
nfs_shares_config: /etc/cinder/nfs_shares
shares:
- - ip: "172.29.244.1
4
"
+ - ip: "172.29.244.1
2
"
share: "/volumes"
controller02:
share: "/volumes"
controller02:
- ip: 172.29.236.1
3
+ ip: 172.29.236.1
5
container_vars:
cinder_backends:
limit_container_types: cinder_volume
container_vars:
cinder_backends:
limit_container_types: cinder_volume
@@
-251,5
+251,5
@@
storage_hosts:
nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
nfs_shares_config: /etc/cinder/nfs_shares
shares:
nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
nfs_shares_config: /etc/cinder/nfs_shares
shares:
- - ip: "172.29.244.1
4
"
+ - ip: "172.29.244.1
2
"
share: "/volumes"
share: "/volumes"