| commit | e2b3cb36611d7215637d1d9d93dd7efcb625f5f8 | [log] [tgz] |
|---|---|---|
| author | Machi Hoshino <mhoshino@mirantis.com> | Wed Dec 12 10:14:23 2018 +0800 |
| committer | Machi Hoshino <mhoshino@mirantis.com> | Thu Dec 13 00:04:48 2018 +0900 |
| tree | 5a76de42677132fb90ae0dd08874845e874a0a32 | |
| parent | 7dd33c3b1bc12cb56165f8739916629473a9e344 [diff] |
Add support soft_delete https://mirantis.jira.com/browse/PROD-25772 Change-Id: I14edb5e815f6054757146a48a3a9d7f996821477
diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls index 9534c83..4988c0b 100644 --- a/tests/pillar/compute_cluster.sls +++ b/tests/pillar/compute_cluster.sls
@@ -97,3 +97,4 @@ dynamic_ownership: 1 consoleauth: token_ttl: 600 + reclaim_instance_interval: 60
diff --git a/tests/pillar/compute_single.sls b/tests/pillar/compute_single.sls index 6a15ae1..c2b740a 100644 --- a/tests/pillar/compute_single.sls +++ b/tests/pillar/compute_single.sls
@@ -70,3 +70,4 @@ dynamic_ownership: 1 consoleauth: token_ttl: 600 + reclaim_instance_interval: 60
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls index 558a692..e3bf663 100644 --- a/tests/pillar/control_cluster.sls +++ b/tests/pillar/control_cluster.sls
@@ -77,6 +77,7 @@ enabled: true consoleauth: token_ttl: 600 + reclaim_instance_interval: 60 apache: server: enabled: true
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls index 3fff016..443e821 100644 --- a/tests/pillar/control_single.sls +++ b/tests/pillar/control_single.sls
@@ -87,6 +87,7 @@ 'context_is_admin': 'role:admin or role:administrator' 'compute:create': 'rule:admin_or_owner' 'compute:create:attach_network': + reclaim_instance_interval: 60 apache: server: enabled: true