Merge "Pin reclass to 1.4.1 on test-salt-model-node jobs"
diff --git a/elasticsearch/server/curator.yml b/elasticsearch/server/curator.yml
index e4e5ace..fe7383d 100644
--- a/elasticsearch/server/curator.yml
+++ b/elasticsearch/server/curator.yml
@@ -12,41 +12,33 @@
actions:
- action: delete_indices
description: >-
- Delete indices older than ${_param:elasticsearch_curator_retention_period} days (based on index name).
+ Delete indices older than ${_param:elasticsearch_curator_retention_period} days (based on index creation date).
options:
ignore_empty_list: True
- timeout_override:
continue_if_exception: False
disable_action: False
filters:
- filtertype: pattern
kind: regex
value: "${_param:elasticsearch_curator_indices_pattern}"
- exclude:
- filtertype: age
- source: name
+ source: creation_date
direction: older
- timestring: '%Y.%m.%d'
unit: days
unit_count: ${_param:elasticsearch_curator_retention_period}
- exclude:
- action: delete_indices
description: >-
- Delete indices older than ${_param:elasticsearch_curator_retention_period} days (based on index name).
+ Delete indices older than ${_param:elasticsearch_curator_retention_period} days (based on index creation date).
options:
ignore_empty_list: True
- timeout_override:
continue_if_exception: False
disable_action: False
filters:
- filtertype: pattern
kind: regex
value: "^events_.*$"
- exclude:
- filtertype: age
- source: name
+ source: creation_date
direction: older
- timestring: '%Y-%m-%d'
unit: days
unit_count: ${_param:elasticsearch_curator_retention_period}
- exclude:
\ No newline at end of file
diff --git a/glance/client/image/vnf_onboarding/metaswitch.yml b/glance/client/image/vnf_onboarding/metaswitch_vsbc.yml
similarity index 100%
rename from glance/client/image/vnf_onboarding/metaswitch.yml
rename to glance/client/image/vnf_onboarding/metaswitch_vsbc.yml
diff --git a/nova/client/flavor/vnf_onboarding/metaswitch.yml b/nova/client/flavor/vnf_onboarding/metaswitch_vsbc.yml
similarity index 100%
rename from nova/client/flavor/vnf_onboarding/metaswitch.yml
rename to nova/client/flavor/vnf_onboarding/metaswitch_vsbc.yml