Merge "Filter out OpenDaylight client on computes"
diff --git a/_states/neutronng.py b/_states/neutronng.py
index ca50c21..351b1d1 100644
--- a/_states/neutronng.py
+++ b/_states/neutronng.py
@@ -84,7 +84,8 @@
provider_segmentation_id=None,
profile=None,
endpoint_type=None,
- dns_domain=None):
+ dns_domain=None,
+ is_default=None):
'''
Ensure that the neutron network is present with the specified properties.
name
@@ -105,7 +106,8 @@
shared=shared,
tenant_id=tenant_id,
provider_segmentation_id=provider_segmentation_id,
- dns_domain=dns_domain)
+ dns_domain=dns_domain,
+ is_default=is_default)
if len(existing_networks) == 0:
network_arguments.update(connection_args)
diff --git a/neutron/client.sls b/neutron/client.sls
index 2f8e6b9..b4bb7ac 100644
--- a/neutron/client.sls
+++ b/neutron/client.sls
@@ -61,6 +61,9 @@
{%- if network.dns_domain is defined %}
- dns_domain: {{ network.dns_domain }}
{%- endif %}
+ {%- if network.is_default is defined %}
+ - is_default: {{ network.is_default }}
+ {%- endif %}
{%- if network.subnet is defined %}
diff --git a/neutron/meta/grafana.yml b/neutron/meta/grafana.yml
index 7d0dd2b..6d8278e 100644
--- a/neutron/meta/grafana.yml
+++ b/neutron/meta/grafana.yml
@@ -77,6 +77,21 @@
cluster_status:
rawQuery: true
query: SELECT last(value) FROM cluster_status WHERE cluster_name = 'neutron-control' AND environment_label = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)
+{%- if pillar.neutron.get('server', {}).get('backend', {}).engine is defined and pillar.neutron.server.backend.engine == "ml2" %}
+ ost-data-plane:
+ title: OpenStack Data Plane
+ panel:
+ neutron:
+ title: Neutron
+ links:
+ - dashboard: Neutron
+ title: Neutron
+ type: dashboard
+ target:
+ cluster_status:
+ rawQuery: true
+ query: SELECT last(value) FROM cluster_status WHERE cluster_name = 'neutron-data' AND environment_label = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)
+{%- endif %}
main_prometheus:
datasource: prometheus
row:
@@ -93,19 +108,6 @@
cluster_status:
expr: avg(openstack_api_check_status{service=~"neutron.*"})
{%- if pillar.neutron.get('server', {}).get('backend', {}).engine is defined and pillar.neutron.server.backend.engine == "ml2" %}
- ost-data-plane:
- title: OpenStack Data Plane
- panel:
- neutron:
- title: Neutron
- links:
- - dashboard: Neutron
- title: Neutron
- type: dashboard
- target:
- cluster_status:
- rawQuery: true
- query: SELECT last(value) FROM cluster_status WHERE cluster_name = 'neutron-data' AND environment_label = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)
neutron_influxdb:
datasource: influxdb
format: json