openstack
/
mistral-extra
Code Issues Proposed changes

Fix zabbix example 

* Changed host group name
 * Changed host name
 * Added service port

Change-Id: Id0eea8b10537fc63c11ad18b596fefadbb159843
This commit is contained in:
Nikolay Mahotkin 2014-10-23 12:59:55 +04:00
parent 25621b2428
commit 95f54c8872
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/v2/multiple_services_registration.yaml
View File

@ -11,6 +11,7 @@ workflows:
input: input:
- server_name # Name of the new instance - server_name # Name of the new instance
- server_port
- image_id # image id from Glance service - image_id # image id from Glance service
- flavor_id # flavor id - type of instance hardware - flavor_id # flavor id - type of instance hardware
- ssh_username # VM username - ssh_username # VM username
@ -20,7 +21,6 @@ workflows:
- zabbix_username - zabbix_username
- zabbix_password - zabbix_password
- vyatta_port
- vyatta_host - vyatta_host
- vyatta_username - vyatta_username
- vyatta_password - vyatta_password
@ -43,6 +43,7 @@ workflows:
workflow: zabbix.register_in_zabbix workflow: zabbix.register_in_zabbix
input: input:
machine_ip: $.vm_ip machine_ip: $.vm_ip
machine_port: $.server_port
zabbix_host: $.zabbix_host zabbix_host: $.zabbix_host
zabbix_username: $.zabbix_username zabbix_username: $.zabbix_username
zabbix_password: $.zabbix_password zabbix_password: $.zabbix_password
@ -54,7 +55,7 @@ workflows:
input: input:
machine_ip: $.vm_ip machine_ip: $.vm_ip
machine_name: $.server_name machine_name: $.server_name
port: $.vyatta_port port: $.server_port
vyatta_host: $.vyatta_host vyatta_host: $.vyatta_host
vyatta_username: $.vyatta_username vyatta_username: $.vyatta_username
vyatta_password: $.vyatta_password vyatta_password: $.vyatta_password

7
examples/v2/zabbix/zabbix_machine_registration.yaml
View File

@ -52,6 +52,7 @@ workflows:
input: input:
- machine_ip - machine_ip
- machine_port
- zabbix_host - zabbix_host
- zabbix_username - zabbix_username
- zabbix_password - zabbix_password
@ -68,7 +69,7 @@ workflows:
action: zabbix method="hostgroup.create" auth={$.zabbix_auth} host={$.zabbix_host} action: zabbix method="hostgroup.create" auth={$.zabbix_auth} host={$.zabbix_host}
input: input:
params: params:
- name: Demo host group - name: Mistral demo group
publish: publish:
hostgroup_id: $.result.result.groupids[0] hostgroup_id: $.result.result.groupids[0]
on-success: on-success:
@ -78,9 +79,9 @@ workflows:
action: zabbix method="host.create" auth={$.zabbix_auth} host={$.zabbix_host} action: zabbix method="host.create" auth={$.zabbix_auth} host={$.zabbix_host}
input: input:
params: params:
host: Demo host host: Mistral host
ip: $.machine_ip ip: $.machine_ip
port: 10500 port: $.machine_port
useip: 1 useip: 1
groups: groups:
- groupid: $.hostgroup_id - groupid: $.hostgroup_id