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 "Drop swift ceilometer middleware for pacemaker"
[apex-tripleo-heat-templates.git]
/
nagios3.yaml
diff --git
a/nagios3.yaml
b/nagios3.yaml
index
0db22b8
..
e2ba8cc
100644
(file)
--- a/
nagios3.yaml
+++ b/
nagios3.yaml
@@
-105,10
+105,15
@@
resources:
flavor: { get_param: flavor }
image: { get_param: image }
key_name: { get_param: key_name }
flavor: { get_param: flavor }
image: { get_param: image }
key_name: { get_param: key_name }
- user_data_format: SOFTWARE_CONFIG
networks:
- network: { get_param: server_network }
port: { get_resource: nagios_net_port }
networks:
- network: { get_param: server_network }
port: { get_resource: nagios_net_port }
+ user_data_format: SOFTWARE_CONFIG
+ user_data: {get_resource: NodeUserData}
+
+ NodeUserData:
+ type: OS::TripleO::NodeUserData
+
nagios_floating_ip:
type: OS::Neutron::FloatingIP
properties:
nagios_floating_ip:
type: OS::Neutron::FloatingIP
properties: