Merge "make keystone authentication variable"
diff --git a/opencontrail/compute.sls b/opencontrail/compute.sls
index ca24960..f08aee1 100644
--- a/opencontrail/compute.sls
+++ b/opencontrail/compute.sls
@@ -79,64 +79,6 @@
- require:
- pkg: opencontrail_compute_packages
-{#
-
-{% set interface_params = [
- 'gateway',
- 'mtu',
- 'up_cmds',
- 'pre_up_cmds',
- 'post_up_cmds',
- 'down_cmds',
- 'pre_down_cmds',
- 'post_down_cmds',
- 'master',
- 'slaves',
- 'mode',
- 'lacp_rate'
-] %}
-
-{%- for interface_name, interface in network.interface.iteritems() %}
-{%- if interface_name in ['vhost0', 'bond0', 'p3p1', 'p3p2'] %}
-
-contrail_interface_{{ interface_name }}:
- network.managed:
- - enabled: {{ interface.enabled }}
- - name: {{ interface_name }}
- - type: {{ interface.type }}
- - proto: {{ interface.get('proto', 'static') }}
- {%- if interface.address is defined %}
- - ipaddr: {{ interface.address }}
- - netmask: {{ interface.netmask }}
- {%- endif %}
- {%- if interface.name_servers is defined %}
- - dns: {{ interface.name_servers }}
- {%- endif %}
- {%- for param in interface_params %}
- {{ set_param(param, interface) }}
- {%- endfor %}
- {%- if interface.type == 'bridge' %}
- - bridge: {{ interface_name }}
- - delay: 0
- - bypassfirewall: True
- - use:
- {%- for network in interface.use_interfaces %}
- - network: {{ network }}
- {%- endfor %}
- - ports: {% for network in interface.use_interfaces %}{{ network }} {% endfor %}
- {%- endif %}
- - require:
- {%- for network in interface.get('use_interfaces', []) %}
- - network: linux_interface_{{ network }}
- {%- endfor %}
- - cmd: contrail_load_vrouter_kernel_module
- - watch_in:
- - service: opencontrail_compute_services
-
-{%- endif %}
-{%- endfor %}
-#}
-
{%- endif %}
opencontrail_compute_services:
diff --git a/opencontrail/meta/sensu.yml b/opencontrail/meta/sensu.yml
index f31eca2..a66a363 100644
--- a/opencontrail/meta/sensu.yml
+++ b/opencontrail/meta/sensu.yml
@@ -41,9 +41,21 @@
occurrences: 1
subscribers:
- local-opencontrail-compute
+ local_contrail_vrouter_agent_proc:
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/contrail-vrouter-agent' -u root -c 1:1"
+ interval: 60
+ occurrences: 1
+ subscribers:
+ - local-opencontrail-compute
+ local_contrail_supervisord_proc:
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/supervisord' -u root -c 2:2"
+ interval: 60
+ occurrences: 1
+ subscribers:
+ - local-opencontrail-compute
local_contrail_api:
command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_http -H 0.0.0.0 -p 9100 -w 5 -c 10 -e 401"
interval: 60
occurrences: 1
subscribers:
- - local-opencontrail-config
+ - local-opencontrail-config
\ No newline at end of file