commit b45dbd9a0e93b9e7ee568cdfa30edbf439dbb277
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Nov 19 18:23:52 2018 +0000
committer Gerrit Code Review <mail@domain.com> Mon Nov 19 18:23:52 2018 +0000
tree 6885f4dafba3e8de88251093d155395339c009e8
parent 9ec6e8cce2e7189e9becb705ad6d0eab8b2d82a0
parent 1cc05dee1232165e5ee9f463302f8c43682de241

Merge "Consolidate barbican_integration_enabled settings"

ceph/radosgw/single.yml

diff --git a/ceph/radosgw/single.yml b/ceph/radosgw/single.yml
index d6b9bf7..93db9bb 100644
--- a/ceph/radosgw/single.yml
+++ b/ceph/radosgw/single.yml
@@ -18,4 +18,5 @@
           rgw_dns_name : ${_param:cluster_domain}
           rgw_print_continue: True
           rgw_content_length_compat: true
+          rgw_swift_enforce_content_length: true
           user: www-data

openssh/server/team/members/prazumovsky.yml

diff --git a/openssh/server/team/members/prazumovsky.yml b/openssh/server/team/members/prazumovsky.yml
index 0f297f3..173649e 100644
--- a/openssh/server/team/members/prazumovsky.yml
+++ b/openssh/server/team/members/prazumovsky.yml
@@ -15,5 +15,5 @@
         prazumovsky:
           enabled: true
           public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBySoU/ncTbwN25gxgaubgnB8+xF6mQpiz/tC+MDLitiEw/QHloz6ME5slTJseW2Uvk4jFZz5FNZ9k9/1j+pOtafV8GMHIUOhvX3RUZEiq7wXmcH1T1P4z74Y5anouc82crAWW3d0hQUEAEOx0G3ZGTDmkQTl16mgJvmejvXIN1ESTdEA9tctUogJoSdVu7OGcjGwkqWM9x4CTT7vvD51whHvFswaf6GIWZC3ia1xVTAMJ8W6Xppi5muTW+Uhr4wZm06zZCVHXN+5uYMxwufSoyXc5zwQ+DBPsGENdFvjdNQltlIf9fU3GHuH3d9wAhiPM5CetPcWcj6j2PwwMbx+R prazumovsky@Peters-MacBook-Pro.local
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9+aNOBVCv+g3wLijMgQPKQPAQaZ9UoHiR5WH7cdrC/WtbXMRemufx5TogwuNXJzsD6TG5Egq5gaWqiFHwGeLPwtM8Gce1ke6RxfVAby9H9JPB3QmIAtXw0B1grm8dxK98ST26M1pwrxmukf8Zik1jKLnef4LKG2Aj3RWzSPLz2FHqUKiAI0tx2o1hS46LPMbM81prnnzRvD+V85J0VW9YZ5kjGbQEdACWiyH2Jscp+b/86/CoQs9L81kHvJSONiV8K4EgNasKZiyfWbXD3Y/jmDtwvqBnXZb4Dk0tU6CnjoZZM5naqu4CrIRx+NocHEk1o/L6NC3qUUJngaYZVD53 prazumovsky@MacBook-Pro-prazumovsky.local
           user: ${linux:system:user:prazumovsky}