Merge "Prepare a new TripleO Ocata release"

2017-04-28 01:03:28 +00:00 · 2017-04-28 01:03:28 +00:00 · aca4883f58
commit aca4883f58
parent a760bdda37 647f20304d
14 changed files with 383 additions and 327 deletions
--- a/deliverables/ocata/instack-undercloud.yaml
+++ b/deliverables/ocata/instack-undercloud.yaml
@ -1,28 +1,32 @@
 ---
+branches:
+- location: 6.0.0.0rc1
+  name: stable/ocata
 launchpad: tripleo
 release-model: cycle-trailing
-team: tripleo
 release-notes: https://docs.openstack.org/releasenotes/instack-undercloud/ocata.html
-type: other
-send-announcements-to: openstack-announce@lists.openstack.org
-branches:
-  - name: stable/ocata
-    location: 6.0.0.0rc1
 releases:
-  - version: 6.0.0.0b2
-    projects:
-      - repo: openstack/instack-undercloud
-        hash: 41a6c74e437538530cce7126c306f951f669ac94
-  - version: 6.0.0.0rc1
-    projects:
-      - repo: openstack/instack-undercloud
-        hash: a4e410597c1757e959a7d9b79af265134eef37b3
-  - version: 6.0.0.0rc2
-    projects:
-      - repo: openstack/instack-undercloud
-        hash: e712d17078563bf8c8ded3304f38a0746fb8070b
-  - version: 6.0.0
-    diff-start: 5.0.0.0rc2
-    projects:
-      - repo: openstack/instack-undercloud
-        hash: e712d17078563bf8c8ded3304f38a0746fb8070b
+- projects:
+  - hash: 41a6c74e437538530cce7126c306f951f669ac94
+    repo: openstack/instack-undercloud
+  version: 6.0.0.0b2
+- projects:
+  - hash: a4e410597c1757e959a7d9b79af265134eef37b3
+    repo: openstack/instack-undercloud
+  version: 6.0.0.0rc1
+- projects:
+  - hash: e712d17078563bf8c8ded3304f38a0746fb8070b
+    repo: openstack/instack-undercloud
+  version: 6.0.0.0rc2
+- diff-start: 5.0.0.0rc2
+  projects:
+  - hash: e712d17078563bf8c8ded3304f38a0746fb8070b
+    repo: openstack/instack-undercloud
+  version: 6.0.0
+- projects:
+  - hash: 6790ae8b3d17e6a7aea2a7bf854763486d30c2a1
+    repo: openstack/instack-undercloud
+  version: 6.1.0
+send-announcements-to: openstack-announce@lists.openstack.org
+team: tripleo
+type: other
--- a/deliverables/ocata/instack.yaml
+++ b/deliverables/ocata/instack.yaml
@ -1,13 +1,17 @@
 ---
+branches:
+- location: 6.0.0
+  name: stable/ocata
 launchpad: tripleo
 release-model: cycle-with-intermediary
+releases:
+- projects:
+  - hash: 9e1f7099b24bf51344aa1f33e0a1092730e26c11
+    repo: openstack/instack
+  version: 6.0.0
+- projects:
+  - hash: b3450717177c79b92695359c786f8b385a0691de
+    repo: openstack/instack
+  version: 6.1.0
 team: tripleo
 type: library
-branches:
-  - name: stable/ocata
-    location: 6.0.0
-releases:
-  - version: 6.0.0
-    projects:
-      - repo: openstack/instack
-        hash: 9e1f7099b24bf51344aa1f33e0a1092730e26c11
--- a/deliverables/ocata/os-apply-config.yaml
+++ b/deliverables/ocata/os-apply-config.yaml
@ -1,19 +1,23 @@
 ---
+branches:
+- location: 6.0.0.0rc1
+  name: stable/ocata
 launchpad: os-apply-config
 release-model: cycle-with-milestones
+releases:
+- projects:
+  - hash: 1bd0206930e9af8e91f7eae6878530c6a7968910
+    repo: openstack/os-apply-config
+  version: 6.0.0.0rc1
+- diff-start: 5.0.0
+  projects:
+  - hash: 1bd0206930e9af8e91f7eae6878530c6a7968910
+    repo: openstack/os-apply-config
+  version: 6.0.0
+- projects:
+  - hash: ed286dcdd0eef0ea6703a73f893c03272b5ab9a5
+    repo: openstack/os-apply-config
+  version: 6.1.0
+send-announcements-to: openstack-announce@lists.openstack.org
 team: tripleo
 type: other
-send-announcements-to: openstack-announce@lists.openstack.org
-branches:
-  - name: stable/ocata
-    location: 6.0.0.0rc1
-releases:
-  - version: 6.0.0.0rc1
-    projects:
-      - repo: openstack/os-apply-config
-        hash: 1bd0206930e9af8e91f7eae6878530c6a7968910
-  - version: 6.0.0
-    diff-start: 5.0.0
-    projects:
-      - repo: openstack/os-apply-config
-        hash: 1bd0206930e9af8e91f7eae6878530c6a7968910
--- a/deliverables/ocata/os-collect-config.yaml
+++ b/deliverables/ocata/os-collect-config.yaml
@ -1,27 +1,31 @@
 ---
+branches:
+- location: 6.0.0.0rc1
+  name: stable/ocata
 launchpad: os-collect-config
+release-model: cycle-with-milestones
+releases:
+- projects:
+  - hash: e8e2f3d5f2ebc6c08383bf98e5e27c689fc6e7a1
+    repo: openstack/os-collect-config
+  version: 6.0.0.0b1
+- projects:
+  - hash: bf7cc362d3928aedc2b48f1ffe871436b47b9483
+    repo: openstack/os-collect-config
+  version: 6.0.0.0b2
+- projects:
+  - hash: cb846967f7d8e1f0a14f53e747ea5623e0a559d8
+    repo: openstack/os-collect-config
+  version: 6.0.0.0rc1
+- diff-start: 5.0.0
+  projects:
+  - hash: cb846967f7d8e1f0a14f53e747ea5623e0a559d8
+    repo: openstack/os-collect-config
+  version: 6.0.0
+- projects:
+  - hash: 386cedabf7f38e2f8324b31d566de45457a5a04f
+    repo: openstack/os-collect-config
+  version: 6.1.0
+send-announcements-to: openstack-announce@lists.openstack.org
 team: tripleo
 type: other
-release-model: cycle-with-milestones
-send-announcements-to: openstack-announce@lists.openstack.org
-branches:
-  - name: stable/ocata
-    location: 6.0.0.0rc1
-releases:
-  - version: 6.0.0.0b1
-    projects:
-      - repo: openstack/os-collect-config
-        hash: e8e2f3d5f2ebc6c08383bf98e5e27c689fc6e7a1
-  - version: 6.0.0.0b2
-    projects:
-      - repo: openstack/os-collect-config
-        hash: bf7cc362d3928aedc2b48f1ffe871436b47b9483
-  - version: 6.0.0.0rc1
-    projects:
-      - repo: openstack/os-collect-config
-        hash: cb846967f7d8e1f0a14f53e747ea5623e0a559d8
-  - version: 6.0.0
-    diff-start: 5.0.0
-    projects:
-      - repo: openstack/os-collect-config
-        hash: cb846967f7d8e1f0a14f53e747ea5623e0a559d8
--- a/deliverables/ocata/os-net-config.yaml
+++ b/deliverables/ocata/os-net-config.yaml
@ -1,27 +1,31 @@
 ---
+branches:
+- location: 6.0.0.0rc1
+  name: stable/ocata
 launchpad: os-net-config
+release-model: cycle-with-milestones
+releases:
+- projects:
+  - hash: e479535b508b4072f64300809b824dfecc3a9182
+    repo: openstack/os-net-config
+  version: 6.0.0.0b1
+- projects:
+  - hash: d621022954195049c96b19064f2eddd46ec95fe4
+    repo: openstack/os-net-config
+  version: 6.0.0.0b2
+- projects:
+  - hash: b4ecaa5c344cc33691d91398bfa187e876e6e40d
+    repo: openstack/os-net-config
+  version: 6.0.0.0rc1
+- diff-start: 5.0.0
+  projects:
+  - hash: b4ecaa5c344cc33691d91398bfa187e876e6e40d
+    repo: openstack/os-net-config
+  version: 6.0.0
+- projects:
+  - hash: 9e3d128985ad9053e6df779f001ca8979a9bbf90
+    repo: openstack/os-net-config
+  version: 6.1.0
+send-announcements-to: openstack-announce@lists.openstack.org
 team: tripleo
 type: other
-release-model: cycle-with-milestones
-send-announcements-to: openstack-announce@lists.openstack.org
-branches:
-  - name: stable/ocata
-    location: 6.0.0.0rc1
-releases:
-  - version: 6.0.0.0b1
-    projects:
-      - repo: openstack/os-net-config
-        hash: e479535b508b4072f64300809b824dfecc3a9182
-  - version: 6.0.0.0b2
-    projects:
-      - repo: openstack/os-net-config
-        hash: d621022954195049c96b19064f2eddd46ec95fe4
-  - version: 6.0.0.0rc1
-    projects:
-      - repo: openstack/os-net-config
-        hash: b4ecaa5c344cc33691d91398bfa187e876e6e40d
-  - version: 6.0.0
-    diff-start: 5.0.0
-    projects:
-      - repo: openstack/os-net-config
-        hash: b4ecaa5c344cc33691d91398bfa187e876e6e40d
--- a/deliverables/ocata/os-refresh-config.yaml
+++ b/deliverables/ocata/os-refresh-config.yaml
@ -1,27 +1,31 @@
 ---
+branches:
+- location: 6.0.0.0rc1
+  name: stable/ocata
 launchpad: os-refresh-config
+release-model: cycle-with-milestones
+releases:
+- projects:
+  - hash: 962e02501bf4af3af7286b857115aae01264a91d
+    repo: openstack/os-refresh-config
+  version: 6.0.0.0b1
+- projects:
+  - hash: e403a6bad06be5c28562ed7ee63679f24df354c6
+    repo: openstack/os-refresh-config
+  version: 6.0.0.0b2
+- projects:
+  - hash: 85e9a93481dd2081fc9cfee836eafbde50aae0ca
+    repo: openstack/os-refresh-config
+  version: 6.0.0.0rc1
+- diff-start: 5.0.0
+  projects:
+  - hash: 85e9a93481dd2081fc9cfee836eafbde50aae0ca
+    repo: openstack/os-refresh-config
+  version: 6.0.0
+- projects:
+  - hash: 5d68491b0571e53350310667fcfab6a67553c7b7
+    repo: openstack/os-refresh-config
+  version: 6.1.0
+send-announcements-to: openstack-announce@lists.openstack.org
 team: tripleo
 type: other
-release-model: cycle-with-milestones
-send-announcements-to: openstack-announce@lists.openstack.org
-branches:
-  - name: stable/ocata
-    location: 6.0.0.0rc1
-releases:
-  - version: 6.0.0.0b1
-    projects:
-      - repo: openstack/os-refresh-config
-        hash: 962e02501bf4af3af7286b857115aae01264a91d
-  - version: 6.0.0.0b2
-    projects:
-      - repo: openstack/os-refresh-config
-        hash: e403a6bad06be5c28562ed7ee63679f24df354c6
-  - version: 6.0.0.0rc1
-    projects:
-      - repo: openstack/os-refresh-config
-        hash: 85e9a93481dd2081fc9cfee836eafbde50aae0ca
-  - version: 6.0.0
-    diff-start: 5.0.0
-    projects:
-      - repo: openstack/os-refresh-config
-        hash: 85e9a93481dd2081fc9cfee836eafbde50aae0ca
--- a/deliverables/ocata/puppet-tripleo.yaml
+++ b/deliverables/ocata/puppet-tripleo.yaml
@ -1,27 +1,31 @@
 ---
-launchpad: puppet-tripleo
-team: tripleo
-release-notes: https://docs.openstack.org/releasenotes/puppet-tripleo/ocata.html
-type: other
-release-model: cycle-trailing
 branches:
-  - name: stable/ocata
-    location: 6.2.0
-send-announcements-to: openstack-announce@lists.openstack.org
+- location: 6.2.0
+  name: stable/ocata
+launchpad: puppet-tripleo
+release-model: cycle-trailing
+release-notes: https://docs.openstack.org/releasenotes/puppet-tripleo/ocata.html
 releases:
-  - version: 6.0.0
-    projects:
-      - repo: openstack/puppet-tripleo
-        hash: a63f799dbfb1a6cabb1ec18d929fa682fbf30289
-  - version: 6.1.0
-    projects:
-      - repo: openstack/puppet-tripleo
-        hash: 34253ecfb5c8e1f2b44567892785d2dc3af695d0
-  - version: 6.2.0
-    projects:
-      - repo: openstack/puppet-tripleo
-        hash: 9ad8e263f7c6ef5304b4e8229e93c1d8add38596
-  - version: 6.3.0
-    projects:
-      - repo: openstack/puppet-tripleo
-        hash: 208f068a488a9b5b3f40c64af3bb50dbbc07730e
+- projects:
+  - hash: a63f799dbfb1a6cabb1ec18d929fa682fbf30289
+    repo: openstack/puppet-tripleo
+  version: 6.0.0
+- projects:
+  - hash: 34253ecfb5c8e1f2b44567892785d2dc3af695d0
+    repo: openstack/puppet-tripleo
+  version: 6.1.0
+- projects:
+  - hash: 9ad8e263f7c6ef5304b4e8229e93c1d8add38596
+    repo: openstack/puppet-tripleo
+  version: 6.2.0
+- projects:
+  - hash: 208f068a488a9b5b3f40c64af3bb50dbbc07730e
+    repo: openstack/puppet-tripleo
+  version: 6.3.0
+- projects:
+  - hash: f9867d23c58ccbbb0d30ecd6104f7745b9fa1436
+    repo: openstack/puppet-tripleo
+  version: 6.4.0
+send-announcements-to: openstack-announce@lists.openstack.org
+team: tripleo
+type: other
--- a/deliverables/ocata/python-tripleoclient.yaml
+++ b/deliverables/ocata/python-tripleoclient.yaml
@ -1,31 +1,35 @@
 ---
-launchpad: tripleo
-team: tripleo
-release-notes: https://docs.openstack.org/releasenotes/python-tripleoclient/ocata.html
-type: library
-release-model: cycle-trailing
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
-  - name: stable/ocata
-    location: 6.0.0
+- location: 6.0.0
+  name: stable/ocata
+launchpad: tripleo
+release-model: cycle-trailing
+release-notes: https://docs.openstack.org/releasenotes/python-tripleoclient/ocata.html
 releases:
-  - version: 5.5.0
-    projects:
-      - repo: openstack/python-tripleoclient
-        hash: 2cc4eef66060bf4fc4071c2368b59fe4df7ace14
-  - version: 5.6.0
-    projects:
-      - repo: openstack/python-tripleoclient
-        hash: 73756fce003f404d51547ab986debd40561619ce
-  - version: 5.7.0
-    projects:
-      - repo: openstack/python-tripleoclient
-        hash: 784e6373e72eef959efc3d163e400ad2a41be918
-  - version: 6.0.0
-    projects:
-      - repo: openstack/python-tripleoclient
-        hash: 553e46e76a167612f53d86ad8474fce5f1f35b53
-  - version: 6.1.0
-    projects:
-      - repo: openstack/python-tripleoclient
-        hash: f8f29721208f5d1827f7b83eee158bd16af058bf
+- projects:
+  - hash: 2cc4eef66060bf4fc4071c2368b59fe4df7ace14
+    repo: openstack/python-tripleoclient
+  version: 5.5.0
+- projects:
+  - hash: 73756fce003f404d51547ab986debd40561619ce
+    repo: openstack/python-tripleoclient
+  version: 5.6.0
+- projects:
+  - hash: 784e6373e72eef959efc3d163e400ad2a41be918
+    repo: openstack/python-tripleoclient
+  version: 5.7.0
+- projects:
+  - hash: 553e46e76a167612f53d86ad8474fce5f1f35b53
+    repo: openstack/python-tripleoclient
+  version: 6.0.0
+- projects:
+  - hash: f8f29721208f5d1827f7b83eee158bd16af058bf
+    repo: openstack/python-tripleoclient
+  version: 6.1.0
+- projects:
+  - hash: 69dfe0a5ddb32c61d59e609fbda41cbd18c39147
+    repo: openstack/python-tripleoclient
+  version: 6.2.0
+send-announcements-to: openstack-announce@lists.openstack.org
+team: tripleo
+type: library
--- a/deliverables/ocata/tripleo-common.yaml
+++ b/deliverables/ocata/tripleo-common.yaml
@ -1,31 +1,35 @@
 ---
-launchpad: tripleo-common
-team: tripleo
-release-notes: https://docs.openstack.org/releasenotes/tripleo-common/ocata.html
-type: other
-release-model: cycle-trailing
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
-  - name: stable/ocata
-    location: 5.8.0
+- location: 5.8.0
+  name: stable/ocata
+launchpad: tripleo-common
+release-model: cycle-trailing
+release-notes: https://docs.openstack.org/releasenotes/tripleo-common/ocata.html
 releases:
-  - version: 5.5.0
-    projects:
-      - repo: openstack/tripleo-common
-        hash: 6b29e69077c3a4acb78c0d024b6c76b85de25a58
-  - version: 5.6.0
-    projects:
-      - repo: openstack/tripleo-common
-        hash: 8affc8aafecc74c49af6593e4ec9ce1723845925
-  - version: 5.7.0
-    projects:
-      - repo: openstack/tripleo-common
-        hash: c7472c13d690374987cbc93d97249bec35d5810d
-  - version: 5.8.0
-    projects:
-      - repo: openstack/tripleo-common
-        hash: 23977cd4d80c6d5427ea579fb330c1b8ec302964
-  - version: 6.0.0
-    projects:
-      - repo: openstack/tripleo-common
-        hash: 88a547f962b0b4f9690936a82a862feaf7b8f562
+- projects:
+  - hash: 6b29e69077c3a4acb78c0d024b6c76b85de25a58
+    repo: openstack/tripleo-common
+  version: 5.5.0
+- projects:
+  - hash: 8affc8aafecc74c49af6593e4ec9ce1723845925
+    repo: openstack/tripleo-common
+  version: 5.6.0
+- projects:
+  - hash: c7472c13d690374987cbc93d97249bec35d5810d
+    repo: openstack/tripleo-common
+  version: 5.7.0
+- projects:
+  - hash: 23977cd4d80c6d5427ea579fb330c1b8ec302964
+    repo: openstack/tripleo-common
+  version: 5.8.0
+- projects:
+  - hash: 88a547f962b0b4f9690936a82a862feaf7b8f562
+    repo: openstack/tripleo-common
+  version: 6.0.0
+- projects:
+  - hash: f2a78d4b03fe29defc02783f6aab213f848c3c2e
+    repo: openstack/tripleo-common
+  version: 6.1.0
+send-announcements-to: openstack-announce@lists.openstack.org
+team: tripleo
+type: other
--- a/deliverables/ocata/tripleo-heat-templates.yaml
+++ b/deliverables/ocata/tripleo-heat-templates.yaml
@ -1,32 +1,36 @@
 ---
-launchpad: tripleo
-team: tripleo
-release-notes: https://docs.openstack.org/releasenotes/tripleo-heat-templates/ocata.html
-type: other
-release-model: cycle-trailing
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
-  - name: stable/ocata
-    location: 6.0.0.0rc1
+- location: 6.0.0.0rc1
+  name: stable/ocata
+launchpad: tripleo
+release-model: cycle-trailing
+release-notes: https://docs.openstack.org/releasenotes/tripleo-heat-templates/ocata.html
 releases:
-  - version: 6.0.0.0b1
-    projects:
-      - repo: openstack/tripleo-heat-templates
-        hash: 521779edd4dbeb65e0c62c48567dd478b3fab5a5
-  - version: 6.0.0.0b2
-    projects:
-      - repo: openstack/tripleo-heat-templates
-        hash: 1e88f875239b30de24552450b623e6892941fa1e
-  - version: 6.0.0.0rc1
-    projects:
-      - repo: openstack/tripleo-heat-templates
-        hash: 5340f64c03902b7a76212a579bcc895d56008df3
-  - version: 6.0.0.0rc2
-    projects:
-      - repo: openstack/tripleo-heat-templates
-        hash: 5f278ebc5cd3426d58c8a05c0f58309681efa055
-  - version: 6.0.0
-    diff-start: 5.0.0.0rc2
-    projects:
-      - repo: openstack/tripleo-heat-templates
-        hash: 5f278ebc5cd3426d58c8a05c0f58309681efa055
+- projects:
+  - hash: 521779edd4dbeb65e0c62c48567dd478b3fab5a5
+    repo: openstack/tripleo-heat-templates
+  version: 6.0.0.0b1
+- projects:
+  - hash: 1e88f875239b30de24552450b623e6892941fa1e
+    repo: openstack/tripleo-heat-templates
+  version: 6.0.0.0b2
+- projects:
+  - hash: 5340f64c03902b7a76212a579bcc895d56008df3
+    repo: openstack/tripleo-heat-templates
+  version: 6.0.0.0rc1
+- projects:
+  - hash: 5f278ebc5cd3426d58c8a05c0f58309681efa055
+    repo: openstack/tripleo-heat-templates
+  version: 6.0.0.0rc2
+- diff-start: 5.0.0.0rc2
+  projects:
+  - hash: 5f278ebc5cd3426d58c8a05c0f58309681efa055
+    repo: openstack/tripleo-heat-templates
+  version: 6.0.0
+- projects:
+  - hash: 0b8fa1c7fecf0a95029a25a1e38218e55f085db6
+    repo: openstack/tripleo-heat-templates
+  version: 6.1.0
+send-announcements-to: openstack-announce@lists.openstack.org
+team: tripleo
+type: other
--- a/deliverables/ocata/tripleo-image-elements.yaml
+++ b/deliverables/ocata/tripleo-image-elements.yaml
@ -1,32 +1,36 @@
 ---
-launchpad: tripleo
-team: tripleo
-release-notes: https://docs.openstack.org/releasenotes/tripleo-image-elements/ocata.html
-type: other
-release-model: cycle-trailing
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
-  - name: stable/ocata
-    location: 6.0.0.0rc1
+- location: 6.0.0.0rc1
+  name: stable/ocata
+launchpad: tripleo
+release-model: cycle-trailing
+release-notes: https://docs.openstack.org/releasenotes/tripleo-image-elements/ocata.html
 releases:
-  - version: 6.0.0.0b1
-    projects:
-      - repo: openstack/tripleo-image-elements
-        hash: 8c959cfad29aac9627badc5faa0eed05b9cc682e
-  - version: 6.0.0.0b2
-    projects:
-      - repo: openstack/tripleo-image-elements
-        hash: 57a19a7267a8608a434ba05529be9fba297f6027
-  - version: 6.0.0.0rc1
-    projects:
-      - repo: openstack/tripleo-image-elements
-        hash: 662ba3938c8565cbb6c815a37d7d0f280e2ea9ce
-  - version: 6.0.0.0rc2
-    projects:
-      - repo: openstack/tripleo-image-elements
-        hash: ad33b596a7455812933369e9185119e55f64b1b0
-  - version: 6.0.0
-    diff-start: 5.0.0
-    projects:
-      - repo: openstack/tripleo-image-elements
-        hash: ad33b596a7455812933369e9185119e55f64b1b0
+- projects:
+  - hash: 8c959cfad29aac9627badc5faa0eed05b9cc682e
+    repo: openstack/tripleo-image-elements
+  version: 6.0.0.0b1
+- projects:
+  - hash: 57a19a7267a8608a434ba05529be9fba297f6027
+    repo: openstack/tripleo-image-elements
+  version: 6.0.0.0b2
+- projects:
+  - hash: 662ba3938c8565cbb6c815a37d7d0f280e2ea9ce
+    repo: openstack/tripleo-image-elements
+  version: 6.0.0.0rc1
+- projects:
+  - hash: ad33b596a7455812933369e9185119e55f64b1b0
+    repo: openstack/tripleo-image-elements
+  version: 6.0.0.0rc2
+- diff-start: 5.0.0
+  projects:
+  - hash: ad33b596a7455812933369e9185119e55f64b1b0
+    repo: openstack/tripleo-image-elements
+  version: 6.0.0
+- projects:
+  - hash: ee2e37a997c8ddef32511d5e2c033b746340b35b
+    repo: openstack/tripleo-image-elements
+  version: 6.1.0
+send-announcements-to: openstack-announce@lists.openstack.org
+team: tripleo
+type: other
--- a/deliverables/ocata/tripleo-puppet-elements.yaml
+++ b/deliverables/ocata/tripleo-puppet-elements.yaml
@ -1,32 +1,36 @@
 ---
-launchpad: tripleo
-team: tripleo
-release-notes: https://docs.openstack.org/releasenotes/tripleo-puppet-elements/ocata.html
-type: other
-release-model: cycle-trailing
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
-  - name: stable/ocata
-    location: 6.0.0.0rc1
+- location: 6.0.0.0rc1
+  name: stable/ocata
+launchpad: tripleo
+release-model: cycle-trailing
+release-notes: https://docs.openstack.org/releasenotes/tripleo-puppet-elements/ocata.html
 releases:
-  - version: 6.0.0.0b1
-    projects:
-      - repo: openstack/tripleo-puppet-elements
-        hash: 94f02710ff06516da530c2386f2ab37fb8b8c843
-  - version: 6.0.0.0b2
-    projects:
-      - repo: openstack/tripleo-puppet-elements
-        hash: a778205b0aa2d8202043f56287f7dd12c470fd85
-  - version: 6.0.0.0rc1
-    projects:
-      - repo: openstack/tripleo-puppet-elements
-        hash: 1a97231c1a694fc396b3a6eca80e90d36a864c05
-  - version: 6.0.0.0rc2
-    projects:
-      - repo: openstack/tripleo-puppet-elements
-        hash: bb18776dae74406fbf8bd49627abc24f8ad5952d
-  - version: 6.0.0
-    diff-start: 5.0.0
-    projects:
-      - repo: openstack/tripleo-puppet-elements
-        hash: bb18776dae74406fbf8bd49627abc24f8ad5952d
+- projects:
+  - hash: 94f02710ff06516da530c2386f2ab37fb8b8c843
+    repo: openstack/tripleo-puppet-elements
+  version: 6.0.0.0b1
+- projects:
+  - hash: a778205b0aa2d8202043f56287f7dd12c470fd85
+    repo: openstack/tripleo-puppet-elements
+  version: 6.0.0.0b2
+- projects:
+  - hash: 1a97231c1a694fc396b3a6eca80e90d36a864c05
+    repo: openstack/tripleo-puppet-elements
+  version: 6.0.0.0rc1
+- projects:
+  - hash: bb18776dae74406fbf8bd49627abc24f8ad5952d
+    repo: openstack/tripleo-puppet-elements
+  version: 6.0.0.0rc2
+- diff-start: 5.0.0
+  projects:
+  - hash: bb18776dae74406fbf8bd49627abc24f8ad5952d
+    repo: openstack/tripleo-puppet-elements
+  version: 6.0.0
+- projects:
+  - hash: f98d819796f9aef0d8d854ffce077e541155e5e7
+    repo: openstack/tripleo-puppet-elements
+  version: 6.1.0
+send-announcements-to: openstack-announce@lists.openstack.org
+team: tripleo
+type: other
--- a/deliverables/ocata/tripleo-ui.yaml
+++ b/deliverables/ocata/tripleo-ui.yaml
@ -1,27 +1,31 @@
 ---
-launchpad: tripleo
-team: tripleo
-release-notes: https://docs.openstack.org/releasenotes/tripleo-ui/ocata.html
-type: other
-release-model: cycle-with-intermediary
-send-announcements-to: openstack-announce@lists.openstack.org
 branches:
-  - name: stable/ocata
-    location: 3.0.0
+- location: 3.0.0
+  name: stable/ocata
+launchpad: tripleo
+release-model: cycle-with-intermediary
+release-notes: https://docs.openstack.org/releasenotes/tripleo-ui/ocata.html
 releases:
-  - version: 2.0.0
-    projects:
-      - repo: openstack/tripleo-ui
-        hash: 75a4c46df310bae25ccc0677bc4e065ef70bf288
-  - version: 2.0.1
-    projects:
-      - repo: openstack/tripleo-ui
-        hash: 2dfbb0bfef1f74c2f0b3ca7471622eb5a3e8c2be
-  - version: 3.0.0
-    projects:
-      - repo: openstack/tripleo-ui
-        hash: d760973c2c661af1586b74581217119facb46795
-  - version: 3.1.0
-    projects:
-      - repo: openstack/tripleo-ui
-        hash: 71187598beac90ced60d9e1de1095b3b6268db4c
+- projects:
+  - hash: 75a4c46df310bae25ccc0677bc4e065ef70bf288
+    repo: openstack/tripleo-ui
+  version: 2.0.0
+- projects:
+  - hash: 2dfbb0bfef1f74c2f0b3ca7471622eb5a3e8c2be
+    repo: openstack/tripleo-ui
+  version: 2.0.1
+- projects:
+  - hash: d760973c2c661af1586b74581217119facb46795
+    repo: openstack/tripleo-ui
+  version: 3.0.0
+- projects:
+  - hash: 71187598beac90ced60d9e1de1095b3b6268db4c
+    repo: openstack/tripleo-ui
+  version: 3.1.0
+- projects:
+  - hash: 7372bbfb868dd904b3541668d13706abf0aee544
+    repo: openstack/tripleo-ui
+  version: 3.2.0
+send-announcements-to: openstack-announce@lists.openstack.org
+team: tripleo
+type: other
--- a/deliverables/ocata/tripleo-validations.yaml
+++ b/deliverables/ocata/tripleo-validations.yaml
@ -1,26 +1,30 @@
 ---
+branches:
+- location: 5.4.0
+  name: stable/ocata
 launchpad: tripleo
+release-model: cycle-with-intermediary
+releases:
+- projects:
+  - hash: e7192c38d1dcb6e94866057526dd106b00a9749d
+    repo: openstack/tripleo-validations
+  version: 5.2.0
+- projects:
+  - hash: 2a92f61346cb28e9d7b88b779f9c6e92bf3817dd
+    repo: openstack/tripleo-validations
+  version: 5.3.0
+- projects:
+  - hash: 6b928f1c15fa68172c5981fd5581853e0ac5deb0
+    repo: openstack/tripleo-validations
+  version: 5.4.0
+- projects:
+  - hash: bb22b760da9ceb5b54a802ee84370fdd260f5680
+    repo: openstack/tripleo-validations
+  version: 5.5.0
+- projects:
+  - hash: bb22b760da9ceb5b54a802ee84370fdd260f5680
+    repo: openstack/tripleo-validations
+  version: 5.6.0
+send-announcements-to: openstack-announce@lists.openstack.org
 team: tripleo
 type: other
-release-model: cycle-with-intermediary
-send-announcements-to: openstack-announce@lists.openstack.org
-branches:
-  - name: stable/ocata
-    location: 5.4.0
-releases:
-  - version: 5.2.0
-    projects:
-      - repo: openstack/tripleo-validations
-        hash: e7192c38d1dcb6e94866057526dd106b00a9749d
-  - version: 5.3.0
-    projects:
-      - repo: openstack/tripleo-validations
-        hash: 2a92f61346cb28e9d7b88b779f9c6e92bf3817dd
-  - version: 5.4.0
-    projects:
-      - repo: openstack/tripleo-validations
-        hash: 6b928f1c15fa68172c5981fd5581853e0ac5deb0
-  - version: 5.5.0
-    projects:
-      - repo: openstack/tripleo-validations
-        hash: bb22b760da9ceb5b54a802ee84370fdd260f5680