Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Restore rabbit.host and add an haproxy rabbit listener"
[apex-tripleo-heat-templates.git]
/
nova-compute-config.yaml
diff --git
a/nova-compute-config.yaml
b/nova-compute-config.yaml
index
6c6f7dc
..
cb428ea
100644
(file)
--- a/
nova-compute-config.yaml
+++ b/
nova-compute-config.yaml
@@
-1,7
+1,7
@@
-
R
esources:
+
r
esources:
NovaComputeConfig:
NovaComputeConfig:
-
T
ype: OS::Heat::StructuredConfig
-
P
roperties:
+
t
ype: OS::Heat::StructuredConfig
+
p
roperties:
group: os-apply-config
config:
nova:
group: os-apply-config
config:
nova:
@@
-21,6
+21,8
@@
Resources:
readonly_user_password: {get_input: snmpd_readonly_user_password}
glance:
host: {get_input: glance_host}
readonly_user_password: {get_input: snmpd_readonly_user_password}
glance:
host: {get_input: glance_host}
+ port: {get_input: glance_port}
+ protocol: {get_input: glance_protocol}
keystone:
host: {get_input: keystone_host}
neutron:
keystone:
host: {get_input: keystone_host}
neutron:
@@
-38,7
+40,8
@@
Resources:
service-password: {get_input: neutron_password}
admin-password: {get_input: admin_password}
rabbit:
service-password: {get_input: neutron_password}
admin-password: {get_input: admin_password}
rabbit:
- username: {get_input: rabbit_user_name}
+ host: {get_input: rabbit_host}
+ username: {get_input: rabbit_username}
password: {get_input: rabbit_password}
live-update:
host: {get_input: live_update_host}
password: {get_input: rabbit_password}
live-update:
host: {get_input: live_update_host}
@@
-52,7
+55,7
@@
Resources:
servers:
- {server: {get_input: ntp_server}, fudge: "stratum 0"}
NovaComputePassthrough:
servers:
- {server: {get_input: ntp_server}, fudge: "stratum 0"}
NovaComputePassthrough:
-
T
ype: OS::Heat::StructuredConfig
-
P
roperties:
+
t
ype: OS::Heat::StructuredConfig
+
p
roperties:
group: os-apply-config
config: {get_input: passthrough_config}
group: os-apply-config
config: {get_input: passthrough_config}