Merge "RabbitMQ TLS support"
diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
index f847543..b54d661 100644
--- a/.kitchen.travis.yml
+++ b/.kitchen.travis.yml
@@ -3,4 +3,4 @@
- name: <%= ENV['SUITE'] %>
provisioner:
pillars-from-files:
- neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
+ cinder.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.kitchen.yml b/.kitchen.yml
index 7284f4b..4a31b11 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -15,18 +15,32 @@
grains:
noservices: True
dependencies:
+ - name: linux
+ repo: git
+ source: https://github.com/salt-formulas/salt-formula-linux
- name: keystone
repo: git
source: https://github.com/salt-formulas/salt-formula-keystone
state_top:
base:
"*":
+ - linux.system
- cinder
pillars:
top.sls:
base:
"*":
+ - linux_repo_openstack
- cinder
+ - release
+ release.sls:
+ cinder:
+ controller:
+ version: <%= ENV['OS_VERSION'] || 'ocata' %>
+ volume:
+ version: <%= ENV['OS_VERSION'] || 'ocata' %>
+ pillars-from-files:
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'ocata' %>.sls
verifier:
name: inspec
@@ -49,11 +63,21 @@
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/control_cluster.sls
+ pillars:
+ release.sls:
+ cinder:
+ volume:
+ enabled: false
- name: control_single
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/control_single.sls
+ pillars:
+ release.sls:
+ cinder:
+ volume:
+ enabled: false
- name: gpfs_single
provisioner:
@@ -89,4 +113,5 @@
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/vsp_single.sls
+
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index 77f72c9..9570c9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,26 +17,26 @@
- bundle install
env:
- - PLATFORM=trevorj/salty-whales:trusty SUITE=ceph_single
- - PLATFORM=trevorj/salty-whales:xenial SUITE=ceph_single
- - PLATFORM=trevorj/salty-whales:trusty SUITE=control_cluster
- - PLATFORM=trevorj/salty-whales:xenial SUITE=control_cluster
- - PLATFORM=trevorj/salty-whales:trusty SUITE=control_single
- - PLATFORM=trevorj/salty-whales:xenial SUITE=control_single
- - PLATFORM=trevorj/salty-whales:trusty SUITE=gpfs_single
- - PLATFORM=trevorj/salty-whales:xenial SUITE=gpfs_single
- - PLATFORM=trevorj/salty-whales:trusty SUITE=hp3par_single
- - PLATFORM=trevorj/salty-whales:xenial SUITE=hp3par_single
- - PLATFORM=trevorj/salty-whales:trusty SUITE=lefthand_single
- - PLATFORM=trevorj/salty-whales:xenial SUITE=lefthand_single
- - PLATFORM=trevorj/salty-whales:trusty SUITE=solidfire_single
- - PLATFORM=trevorj/salty-whales:xenial SUITE=solidfire_single
- - PLATFORM=trevorj/salty-whales:trusty SUITE=storwize_single
- - PLATFORM=trevorj/salty-whales:xenial SUITE=storwize_single
- - PLATFORM=trevorj/salty-whales:trusty SUITE=volume_single
- - PLATFORM=trevorj/salty-whales:xenial SUITE=volume_single
- - PLATFORM=trevorj/salty-whales:trusty SUITE=vsp_single
- - PLATFORM=trevorj/salty-whales:xenial SUITE=vsp_single
+ - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=ceph_single
+ - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=ceph_single
+ - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=control_cluster
+ - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=control_cluster
+ - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=control_single
+ - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=control_single
+ - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=gpfs_single
+ - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=gpfs_single
+ - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=hp3par_single
+ - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=hp3par_single
+ - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=lefthand_single
+ - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=lefthand_single
+ - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=solidfire_single
+ - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=solidfire_single
+ - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=storwize_single
+ - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=storwize_single
+ - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=volume_single
+ - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=volume_single
+ - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=vsp_single
+ - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=vsp_single
before_script:
- set -o pipefail
diff --git a/README.rst b/README.rst
index 59e3fcc..e9eb4cf 100644
--- a/README.rst
+++ b/README.rst
@@ -22,6 +22,8 @@
cinder_gid: 304
nas_secure_file_permissions: false
nas_secure_file_operations: false
+ cinder_internal_tenant_user_id: f46924c112a14c80ab0a24a613d95eef
+ cinder_internal_tenant_project_id: b7455b8974bb4064ad247c8f375eae6c
default_volume_type: 7k2SaS
availability_zone_fallback: True
database:
@@ -69,6 +71,8 @@
cinder_gid: 304
nas_secure_file_permissions: false
nas_secure_file_operations: false
+ cinder_internal_tenant_user_id: f46924c112a14c80ab0a24a613d95eef
+ cinder_internal_tenant_project_id: b7455b8974bb4064ad247c8f375eae6c
default_volume_type: 7k2SaS
database:
engine: mysql
diff --git a/cinder/controller.sls b/cinder/controller.sls
index be0f017..05c3c99 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -123,7 +123,6 @@
- require:
- service: cinder_controller_services
-{# new way #}
{%- if not grains.get('noservices', False) %}
{%- for backend_name, backend in controller.get('backend', {}).iteritems() %}
@@ -174,28 +173,6 @@
{%- endif %}
-{# old way #}
-
-{% for type in controller.get('types', []) %}
-
-cinder_type_create_{{ type.name }}:
- cmd.run:
- - name: "source /root/keystonerc; cinder type-create {{ type.name }}"
- - unless: "source /root/keystonerc; cinder type-list | grep {{ type.name }}"
- - shell: /bin/bash
- - require:
- - service: cinder_controller_services
-
-cinder_type_update_{{ type.name }}:
- cmd.run:
- - name: "source /root/keystonerc; cinder type-key {{ type.name }} set volume_backend_name={{ type.get('backend', type.name) }}"
- - unless: "source /root/keystonerc; cinder extra-specs-list | grep \"{u'volume_backend_name': u'{{ type.get('backend', type.name) }}'}\""
- - shell: /bin/bash
- - require:
- - cmd: cinder_type_create_{{ type.name }}
-
-{% endfor %}
-
{%- if controller.backup.engine != None %}
cinder_backup_packages:
diff --git a/cinder/files/backend/_ceph.conf b/cinder/files/backend/_ceph.conf
index 524bb6b..4e06c34 100644
--- a/cinder/files/backend/_ceph.conf
+++ b/cinder/files/backend/_ceph.conf
@@ -17,7 +17,7 @@
# Path to the ceph configuration file (string value)
#rbd_ceph_conf=
-rbd_ceph_conf=/etc/ceph/ceph.conf
+rbd_ceph_conf={{ backend.get('rbd_ceph_conf','/etc/ceph/ceph.conf') }}
# Flatten volumes created from snapshots to remove dependency
# from volume to snapshot (boolean value)
diff --git a/cinder/files/grafana_dashboards/cinder_prometheus.json b/cinder/files/grafana_dashboards/cinder_prometheus.json
index de1e2f8..ce024b4 100644
--- a/cinder/files/grafana_dashboards/cinder_prometheus.json
+++ b/cinder/files/grafana_dashboards/cinder_prometheus.json
@@ -1,5 +1,8 @@
{% raw %}
{
+ "annotations": {
+ "list": []
+ },
"description": "Monitors Cinder cluster using Prometheus. Shows overall cluster processes and usage.",
"editable": true,
"gnetId": 315,
@@ -74,7 +77,7 @@
"intervalFactor": 2,
"legendFormat": "{{ service }}",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "1,0",
@@ -99,7 +102,7 @@
}
],
"valueName": "current"
- },
+ },
{
"cacheTimeout": null,
"colorBackground": false,
@@ -161,7 +164,7 @@
"intervalFactor": 2,
"legendFormat": "per sec",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -176,27 +179,6 @@
}
],
"valueName": "current"
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": true,
- "title": "Service Status",
- "titleSize": "h6"
- },
- {
- "collapse": false,
- "height": "100px",
- "panels": [
- {
- "content": "<br />\n<h3 align=\"center\"> Up </h3>",
- "id": 3,
- "links": [],
- "mode": "html",
- "span": 1,
- "title": "",
- "type": "text"
},
{
"cacheTimeout": null,
@@ -216,7 +198,7 @@
"thresholdLabels": false,
"thresholdMarkers": true
},
- "id": 4,
+ "id": 3,
"interval": null,
"links": [],
"mappingType": 1,
@@ -259,11 +241,11 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
- "title": "API",
+ "title": "Cinder API backends",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
@@ -280,7 +262,171 @@
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
- "title": "Cinder API",
+ "title": "Service Status",
+ "titleSize": "h6"
+ },
+ {
+ "collapse": false,
+ "height": "250",
+ "panels": [
+ {
+ "aliasColors": {},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": "prometheus",
+ "fill": 1,
+ "id": 4,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 1,
+ "links": [],
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "spaceLength": 10,
+ "span": 6,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "sum(openstack_cinder_http_response_times_rate{host=~\"^$host$\"}) by (http_status)",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{ http_status }}",
+ "refId": "A",
+ "step": 10
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Throughput",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "format": "ops",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": "0",
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "aliasColors": {},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": "prometheus",
+ "fill": 1,
+ "id": 5,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 1,
+ "links": [],
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "spaceLength": 10,
+ "span": 6,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "max(openstack_cinder_http_response_times_upper_90{host=~\"^$host$\"}) by (http_method)",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{ http_method }}",
+ "refId": "A",
+ "step": 10
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Latency",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "format": "s",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": "0",
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ }
+ ],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
+ "showTitle": true,
+ "title": "API Performances",
"titleSize": "h6"
},
{
@@ -357,7 +503,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "1,1",
@@ -434,7 +580,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "1,1",
@@ -511,7 +657,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "1,1",
@@ -543,7 +689,7 @@
"min": false,
"show": true,
"total": false,
- "values": false
+ "values": false
},
"lines": true,
"linewidth": 1,
@@ -566,7 +712,7 @@
"legendFormat": "{{ state }}",
"metric": "openstack_cinder_services",
"refId": "A",
- "step": 2
+ "step": 4
}
],
"thresholds": [],
@@ -576,7 +722,7 @@
"tooltip": {
"shared": true,
"sort": 0,
- "value_type": "individual"
+ "value_type": "individual"
},
"type": "graph",
"xaxis": {
@@ -584,7 +730,7 @@
"mode": "time",
"name": null,
"show": true,
- "values": []
+ "values": []
},
"yaxes": [
{
@@ -613,7 +759,7 @@
"span": 2,
"title": "",
"type": "text"
- },
+ },
{
"cacheTimeout": null,
"colorBackground": false,
@@ -675,7 +821,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "1,1",
@@ -752,7 +898,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "1,1",
@@ -829,7 +975,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "1,1",
@@ -861,7 +1007,7 @@
"min": false,
"show": true,
"total": false,
- "values": false
+ "values": false
},
"lines": true,
"linewidth": 1,
@@ -884,7 +1030,7 @@
"legendFormat": "{{ state }}",
"metric": "openstack_cinder_services",
"refId": "A",
- "step": 2
+ "step": 4
}
],
"thresholds": [],
@@ -894,7 +1040,7 @@
"tooltip": {
"shared": true,
"sort": 0,
- "value_type": "individual"
+ "value_type": "individual"
},
"type": "graph",
"xaxis": {
@@ -902,7 +1048,7 @@
"mode": "time",
"name": null,
"show": true,
- "values": []
+ "values": []
},
"yaxes": [
{
@@ -996,7 +1142,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -1073,7 +1219,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -1150,7 +1296,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -1205,7 +1351,7 @@
"legendFormat": "{{ status }}",
"metric": "openstack_cinder_volumes",
"refId": "A",
- "step": 2
+ "step": 4
}
],
"thresholds": [],
@@ -1252,7 +1398,7 @@
"rgba(50, 172, 45, 0.97)"
],
"datasource": "prometheus",
- "format": "none",
+ "format": "decbytes",
"gauge": {
"maxValue": 100,
"minValue": 0,
@@ -1303,7 +1449,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -1329,7 +1475,7 @@
"rgba(50, 172, 45, 0.97)"
],
"datasource": "prometheus",
- "format": "none",
+ "format": "decbytes",
"gauge": {
"maxValue": 100,
"minValue": 0,
@@ -1380,7 +1526,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -1406,7 +1552,7 @@
"rgba(50, 172, 45, 0.97)"
],
"datasource": "prometheus",
- "format": "none",
+ "format": "decbytes",
"gauge": {
"maxValue": 100,
"minValue": 0,
@@ -1457,7 +1603,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -1512,7 +1658,7 @@
"legendFormat": "{{ status }}",
"metric": "openstack_cinder_volumes_size",
"refId": "A",
- "step": 2
+ "step": 4
}
],
"thresholds": [],
@@ -1534,7 +1680,7 @@
},
"yaxes": [
{
- "format": "short",
+ "format": "decbytes",
"logBase": 1,
"max": null,
"min": 0,
@@ -1610,7 +1756,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -1687,7 +1833,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -1764,7 +1910,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -1819,7 +1965,7 @@
"legendFormat": "{{ status }}",
"metric": "openstack_cinder_snapshots",
"refId": "A",
- "step": 2
+ "step": 4
}
],
"thresholds": [],
@@ -1866,7 +2012,7 @@
"rgba(50, 172, 45, 0.97)"
],
"datasource": "prometheus",
- "format": "none",
+ "format": "decbytes",
"gauge": {
"maxValue": 100,
"minValue": 0,
@@ -1917,7 +2063,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -1943,7 +2089,7 @@
"rgba(50, 172, 45, 0.97)"
],
"datasource": "prometheus",
- "format": "none",
+ "format": "decbytes",
"gauge": {
"maxValue": 100,
"minValue": 0,
@@ -1994,7 +2140,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -2020,7 +2166,7 @@
"rgba(50, 172, 45, 0.97)"
],
"datasource": "prometheus",
- "format": "none",
+ "format": "decbytes",
"gauge": {
"maxValue": 100,
"minValue": 0,
@@ -2071,7 +2217,7 @@
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
- "step": 20
+ "step": 60
}
],
"thresholds": "",
@@ -2126,7 +2272,7 @@
"legendFormat": "{{ status }}",
"metric": "openstack_cinder_snapshots_size",
"refId": "A",
- "step": 2
+ "step": 4
}
],
"thresholds": [],
@@ -2148,7 +2294,7 @@
},
"yaxes": [
{
- "format": "short",
+ "format": "decbytes",
"logBase": 1,
"max": null,
"min": 0,
@@ -2179,7 +2325,29 @@
"cinder"
],
"templating": {
- "list": []
+ "list": [
+ {
+ "allValue": null,
+ "current": {},
+ "datasource": "prometheus",
+ "hide": 0,
+ "includeAll": true,
+ "label": null,
+ "multi": true,
+ "name": "host",
+ "options": [],
+ "query": "label_values(openstack_cinder_http_response_times_count,host)",
+ "refresh": 1,
+ "refresh_on_load": true,
+ "regex": "",
+ "sort": 1,
+ "tagValuesQuery": "",
+ "tags": [],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
+ }
+ ]
},
"time": {
"from": "now-1h",
@@ -2212,6 +2380,6 @@
},
"timezone": "browser",
"title": "Cinder",
- "version": 2
+ "version": 4
}
{% endraw %}
diff --git a/cinder/files/juno/cinder.conf.controller.Debian b/cinder/files/juno/cinder.conf.controller.Debian
index fa9a7b2..d83df84 100644
--- a/cinder/files/juno/cinder.conf.controller.Debian
+++ b/cinder/files/juno/cinder.conf.controller.Debian
@@ -98,6 +98,12 @@
{%- if controller.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ controller.nas_secure_file_operations }}
{%- endif %}
+{%- if controller.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ controller.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if controller.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ controller.cinder_internal_tenant_project_id }}
+{%- endif %}
[keystone_authtoken]
signing_dir=/tmp/keystone-signing-cinder
diff --git a/cinder/files/juno/cinder.conf.volume.Debian b/cinder/files/juno/cinder.conf.volume.Debian
index 72bb396..9766c2e 100644
--- a/cinder/files/juno/cinder.conf.volume.Debian
+++ b/cinder/files/juno/cinder.conf.volume.Debian
@@ -107,6 +107,12 @@
{%- if volume.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ volume.nas_secure_file_operations }}
{%- endif %}
+{%- if volume.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ volume.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if volume.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ volume.cinder_internal_tenant_project_id }}
+{%- endif %}
[keystone_authtoken]
signing_dir=/tmp/keystone-signing-cinder
diff --git a/cinder/files/kilo/cinder.conf.controller.Debian b/cinder/files/kilo/cinder.conf.controller.Debian
index fa481e0..71902e2 100644
--- a/cinder/files/kilo/cinder.conf.controller.Debian
+++ b/cinder/files/kilo/cinder.conf.controller.Debian
@@ -92,6 +92,12 @@
{%- if controller.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ controller.nas_secure_file_operations }}
{%- endif %}
+{%- if controller.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ controller.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if controller.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ controller.cinder_internal_tenant_project_id }}
+{%- endif %}
[oslo_concurrency]
diff --git a/cinder/files/kilo/cinder.conf.volume.Debian b/cinder/files/kilo/cinder.conf.volume.Debian
index bd28a57..3c8c720 100644
--- a/cinder/files/kilo/cinder.conf.volume.Debian
+++ b/cinder/files/kilo/cinder.conf.volume.Debian
@@ -101,6 +101,12 @@
{%- if volume.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ volume.nas_secure_file_operations }}
{%- endif %}
+{%- if volume.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ volume.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if volume.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ volume.cinder_internal_tenant_project_id }}
+{%- endif %}
[oslo_concurrency]
diff --git a/cinder/files/liberty/cinder.conf.controller.Debian b/cinder/files/liberty/cinder.conf.controller.Debian
index 70db3f4..4e86745 100644
--- a/cinder/files/liberty/cinder.conf.controller.Debian
+++ b/cinder/files/liberty/cinder.conf.controller.Debian
@@ -111,6 +111,12 @@
{%- if controller.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ controller.nas_secure_file_operations }}
{%- endif %}
+{%- if controller.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ controller.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if controller.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ controller.cinder_internal_tenant_project_id }}
+{%- endif %}
[oslo_concurrency]
diff --git a/cinder/files/liberty/cinder.conf.volume.Debian b/cinder/files/liberty/cinder.conf.volume.Debian
index f3174a8..7d8c9d3 100644
--- a/cinder/files/liberty/cinder.conf.volume.Debian
+++ b/cinder/files/liberty/cinder.conf.volume.Debian
@@ -95,6 +95,12 @@
{%- if volume.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ volume.nas_secure_file_operations }}
{%- endif %}
+{%- if volume.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ volume.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if volume.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ volume.cinder_internal_tenant_project_id }}
+{%- endif %}
[oslo_concurrency]
diff --git a/cinder/files/mitaka/cinder.conf.controller.Debian b/cinder/files/mitaka/cinder.conf.controller.Debian
index 534c74a..2fd4277 100644
--- a/cinder/files/mitaka/cinder.conf.controller.Debian
+++ b/cinder/files/mitaka/cinder.conf.controller.Debian
@@ -100,6 +100,12 @@
{%- if controller.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ controller.nas_secure_file_operations }}
{%- endif %}
+{%- if controller.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ controller.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if controller.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ controller.cinder_internal_tenant_project_id }}
+{%- endif %}
[oslo_messaging_notifications]
{%- if controller.notification is mapping %}
@@ -227,3 +233,6 @@
{%- if controller.cors.allow_headers is defined %}
allow_headers = {{ controller.cors.allow_headers }}
{%- endif %}
+
+[oslo_middleware]
+secure_proxy_ssl_header = X-Forwarded-Proto
\ No newline at end of file
diff --git a/cinder/files/mitaka/cinder.conf.volume.Debian b/cinder/files/mitaka/cinder.conf.volume.Debian
index 68cc5f0..8e90e4d 100644
--- a/cinder/files/mitaka/cinder.conf.volume.Debian
+++ b/cinder/files/mitaka/cinder.conf.volume.Debian
@@ -85,6 +85,12 @@
{%- if volume.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ volume.nas_secure_file_operations }}
{%- endif %}
+{%- if volume.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ volume.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if volume.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ volume.cinder_internal_tenant_project_id }}
+{%- endif %}
[oslo_messaging_notifications]
{%- if volume.notification is mapping %}
diff --git a/cinder/files/newton/cinder.conf.controller.Debian b/cinder/files/newton/cinder.conf.controller.Debian
index 261ebde..9d2e42b 100644
--- a/cinder/files/newton/cinder.conf.controller.Debian
+++ b/cinder/files/newton/cinder.conf.controller.Debian
@@ -116,6 +116,12 @@
{%- if controller.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ controller.nas_secure_file_operations }}
{%- endif %}
+{%- if controller.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ controller.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if controller.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ controller.cinder_internal_tenant_project_id }}
+{%- endif %}
[oslo_messaging_notifications]
{%- if controller.notification is mapping %}
diff --git a/cinder/files/newton/cinder.conf.volume.Debian b/cinder/files/newton/cinder.conf.volume.Debian
index cfb473f..04d8cc0 100644
--- a/cinder/files/newton/cinder.conf.volume.Debian
+++ b/cinder/files/newton/cinder.conf.volume.Debian
@@ -105,6 +105,12 @@
{%- if volume.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ volume.nas_secure_file_operations }}
{%- endif %}
+{%- if volume.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ volume.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if volume.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ volume.cinder_internal_tenant_project_id }}
+{%- endif %}
[oslo_messaging_notifications]
{%- if volume.notification is mapping %}
diff --git a/cinder/files/ocata/cinder-wsgi.conf b/cinder/files/ocata/cinder-wsgi.conf
index 3e4de23..153adde 100644
--- a/cinder/files/ocata/cinder-wsgi.conf
+++ b/cinder/files/ocata/cinder-wsgi.conf
@@ -1,6 +1,5 @@
{%- from "cinder/map.jinja" import controller with context %}
Listen {{ controller.osapi.host }}:8776
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)" cinder_combined
<VirtualHost {{ controller.osapi.host }}:8776>
WSGIDaemonProcess cinder-wsgi processes=5 threads=1 user=cinder display-name=%{GROUP}
@@ -13,10 +12,10 @@
</IfVersion>
ErrorLog /var/log/apache2/cinder_error.log
- CustomLog /var/log/apache2/cinder.log cinder_combined
+ CustomLog /var/log/apache2/cinder.log "%v:%p %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\""
<Directory /usr/bin>
- <IfVersion >= 2.4>
+ <IfVersion >= 2.4>
Require all granted
</IfVersion>
<IfVersion < 2.4>
diff --git a/cinder/files/ocata/cinder.conf.controller.Debian b/cinder/files/ocata/cinder.conf.controller.Debian
index 261ebde..9d2e42b 100644
--- a/cinder/files/ocata/cinder.conf.controller.Debian
+++ b/cinder/files/ocata/cinder.conf.controller.Debian
@@ -116,6 +116,12 @@
{%- if controller.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ controller.nas_secure_file_operations }}
{%- endif %}
+{%- if controller.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ controller.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if controller.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ controller.cinder_internal_tenant_project_id }}
+{%- endif %}
[oslo_messaging_notifications]
{%- if controller.notification is mapping %}
diff --git a/cinder/files/ocata/cinder.conf.volume.Debian b/cinder/files/ocata/cinder.conf.volume.Debian
index cfb473f..04d8cc0 100644
--- a/cinder/files/ocata/cinder.conf.volume.Debian
+++ b/cinder/files/ocata/cinder.conf.volume.Debian
@@ -105,6 +105,12 @@
{%- if volume.nas_secure_file_operations is defined %}
nas_secure_file_operations={{ volume.nas_secure_file_operations }}
{%- endif %}
+{%- if volume.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ volume.cinder_internal_tenant_user_id }}
+{%- endif %}
+{%- if volume.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ volume.cinder_internal_tenant_project_id }}
+{%- endif %}
[oslo_messaging_notifications]
{%- if volume.notification is mapping %}
diff --git a/cinder/meta/heka.yml b/cinder/meta/heka.yml
index 7186c50..5a87914 100644
--- a/cinder/meta/heka.yml
+++ b/cinder/meta/heka.yml
@@ -2,6 +2,7 @@
{%- from "cinder/map.jinja" import volume as _volume with context %}
{%- set controller = _controller.get('enabled', False) %}
{%- set volume = _volume.get('enabled', False) %}
+{%- set apache_wsgi = controller and _controller.version not in ('juno', 'kilo', 'liberty', 'mitaka', 'newton') %}
log_collector:
decoder:
cinder:
@@ -9,6 +10,16 @@
module_file: /usr/share/lma_collector/decoders/openstack_log.lua
module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
adjust_timezone: true
+{%- if apache_wsgi %}
+ cinder_wsgi:
+ engine: sandbox
+ module_file: /usr/share/lma_collector/decoders/apache_wsgi_log.lua
+ module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
+ config:
+ logger: openstack.cinder
+ apache_log_pattern: >-
+ %v:%p %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+{%- endif %}
splitter:
cinder:
engine: token
@@ -22,6 +33,16 @@
priority: ["^Seq"]
decoder: "cinder_decoder"
splitter: "cinder_splitter"
+{%- if apache_wsgi %}
+ cinder_wsgi_log:
+ engine: logstreamer
+ log_directory: "/var/log/apache2"
+ file_match: 'cinder\.log'
+ differentiator: ['cinder-wsgi']
+ priority: ["^Seq"]
+ decoder: "cinder_wsgi_decoder"
+ splitter: "TokenSplitter"
+{%- endif %}
metric_collector:
trigger:
{%- if controller or volume %}
diff --git a/cinder/meta/prometheus.yml b/cinder/meta/prometheus.yml
index d655a6f..35e5ea8 100644
--- a/cinder/meta/prometheus.yml
+++ b/cinder/meta/prometheus.yml
@@ -18,6 +18,39 @@
summary: "Endpoint check for '{{ $labels.service }}' is down"
description: >-
Endpoint check for '{{ $labels.service }}' is down for 2 minutes
+ CinderSomeServicesDown:
+ if: >-
+ openstack_cinder_services{state="down",service="cinder-volume|cinder-scheduler"} > 0 and ignoring (state) openstack_cinder_services{state="up",services="cinder-volume|cinder-scheduler"} >= 2
+ for: 2m
+ labels:
+ severity: warning
+ service: "{{ $labels.service }}"
+ annotations:
+ summary: "Some {{ $labels.service }} services are down"
+ description: >-
+ {{ $value }} {{ $labels.service }} services are down for 2 minutes
+ CinderOnlyOneServiceUp:
+ if: >-
+ openstack_cinder_services{state="up",service="cinder-volume|cinder-scheduler"} == 1 and ignoring (state) openstack_cinder_services{state="down",service="cinder-volume|cinder-scheduler"} > 0
+ for: 2m
+ labels:
+ severity: critical
+ service: "{{ $labels.service }}"
+ annotations:
+ summary: "Only one {{ $labels.service }} service is up"
+ description: >-
+ Only one {{ $labels.service }} service is up for 2 minutes
+ CinderAllServicesDown:
+ if: >-
+ openstack_cinder_services{state="up",service="cinder-volume|cinder-scheduler"} == 0
+ for: 2m
+ labels:
+ severity: down
+ service: "{{ $labels.service }}"
+ annotations:
+ summary: "All {{ $labels.service }} services are down"
+ description: >-
+ All {{ $labels.service }} services are down for 2 minutes
{%- endraw %}
{%- endif %}
CinderErrorLogsTooHigh:
diff --git a/cinder/volume.sls b/cinder/volume.sls
index da5b12d..80addca 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -88,8 +88,6 @@
- file: /etc/cinder/cinder.conf
- file: /etc/cinder/api-paste.ini
-{# new way #}
-
{%- if volume.backend is defined %}
{%- for backend_name, backend in volume.get('backend', {}).iteritems() %}
@@ -194,92 +192,4 @@
{%- endif %}
-{# old way #}
-
-{%- if volume.storage is defined %}
-
-{%- if volume.storage.engine in ['iscsi', 'hp_lefthand'] %}
-
-cinder_iscsi_packages:
- pkg.installed:
- - names:
- - iscsitarget
- - open-iscsi
- - iscsitarget-dkms
- - require:
- - pkg: cinder_volume_packages
-
-/etc/default/iscsitarget:
- file.managed:
- - source: salt://cinder/files/iscsitarget
- - template: jinja
- - require:
- - pkg: cinder_iscsi_packages
-
-cinder_scsi_service:
- service.running:
- - names:
- - iscsitarget
- - open-iscsi
- - enable: true
- {%- if grains.get('noservices') %}
- - onlyif: /bin/false
- {%- endif %}
- - watch:
- - file: /etc/default/iscsitarget
-
-{%- endif %}
-
-{%- if volume.storage.engine == 'hitachi_vsp' %}
-
-{%- if grains.os_family == 'Debian' and volume.version == 'juno' %}
-
-hitachi_pkgs:
- pkg.latest:
- - names:
- - horcm
- - hbsd
-
-cinder_hitachi_vps_dir:
- file.directory:
- - name: /var/lock/hbsd
- - user: cinder
- - group: cinder
-
-{%- endif %}
-
-{%- endif %}
-
-{%- if volume.storage.engine == 'hp3par' %}
-
-hp3parclient:
- pkg.latest:
- - name: python-hp3parclient
-
-{%- endif %}
-
-{%- if volume.storage.engine == 'fujitsu' %}
-
-cinder_driver_fujitsu:
- pkg.latest:
- - name: cinder-driver-fujitsu
-
-{%- for type in volume.get('types', []) %}
-
-/etc/cinder/cinder_fujitsu_eternus_dx_{{ type.name }}.xml:
- file.managed:
- - source: salt://cinder/files/{{ volume.version }}/cinder_fujitsu_eternus_dx.xml
- - template: jinja
- - defaults:
- volume_type_name: "{{ type.pool }}"
- - require:
- - pkg: cinder-driver-fujitsu
-
-{%- endfor %}
-
-{%- endif %}
-
-{%- endif %}
-
-
{%- endif %}
diff --git a/tests/pillar/repo_mcp_openstack_mitaka.sls b/tests/pillar/repo_mcp_openstack_mitaka.sls
new file mode 100644
index 0000000..ea24305
--- /dev/null
+++ b/tests/pillar/repo_mcp_openstack_mitaka.sls
@@ -0,0 +1,44 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack_repo:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
+ pin:
+ - pin: 'release a=mitaka'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_hotfix:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-hotfix main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
+ pin:
+ - pin: 'release a=mitaka-hotfix'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_security:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-security main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
+ pin:
+ - pin: 'release a=mitaka-security'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_updates:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-updates main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
+ pin:
+ - pin: 'release a=mitaka-uptades'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_holdback:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-holdback main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
+ pin:
+ - pin: 'release a=mitaka-holdback'
+ priority: 1050
+ package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_newton.sls b/tests/pillar/repo_mcp_openstack_newton.sls
new file mode 100644
index 0000000..9504235
--- /dev/null
+++ b/tests/pillar/repo_mcp_openstack_newton.sls
@@ -0,0 +1,44 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack_repo:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
+ pin:
+ - pin: 'release a=newton'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_hotfix:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-hotfix main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
+ pin:
+ - pin: 'release a=newton-hotfix'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_security:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-security main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
+ pin:
+ - pin: 'release a=newton-security'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_updates:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-updates main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
+ pin:
+ - pin: 'release a=newton-uptades'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_holdback:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-holdback main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
+ pin:
+ - pin: 'release a=newton-holdback'
+ priority: 1050
+ package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_ocata.sls b/tests/pillar/repo_mcp_openstack_ocata.sls
new file mode 100644
index 0000000..e601208
--- /dev/null
+++ b/tests/pillar/repo_mcp_openstack_ocata.sls
@@ -0,0 +1,44 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack_repo:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
+ pin:
+ - pin: 'release a=ocata'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_hotfix:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-hotfix main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
+ pin:
+ - pin: 'release a=ocata-hotfix'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_security:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-security main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
+ pin:
+ - pin: 'release a=ocata-security'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_updates:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-updates main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
+ pin:
+ - pin: 'release a=ocata-uptades'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_holdback:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-holdback main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
+ pin:
+ - pin: 'release a=ocata-holdback'
+ priority: 1050
+ package: '*'
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 6710a50..688643f 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -126,6 +126,7 @@
run() {
for pillar in ${PILLARDIR}/*.sls; do
+ grep ${FORMULA_NAME}: ${pillar} &>/dev/null || continue
state_name=$(basename ${pillar%.sls})
salt_run --id=${state_name} state.show_sls ${FORMULA_NAME} || (log_err "Execution of ${FORMULA_NAME}.${state_name} failed"; exit 1)
done