diff --git a/ansible/roles/heat/templates/_deprecated.yaml b/ansible/roles/heat/templates/_deprecated.yaml index 76cc8e387c..39bac77f33 100644 --- a/ansible/roles/heat/templates/_deprecated.yaml +++ b/ansible/roles/heat/templates/_deprecated.yaml @@ -1,3 +1,4 @@ +--- resource_registry: "OS::Heat::HARestarter": "OS::Heat::SoftwareDeployments": diff --git a/contrib/demos/heat/steak-rg.yaml b/contrib/demos/heat/steak-rg.yaml index 4c0a1db936..516d71049a 100644 --- a/contrib/demos/heat/steak-rg.yaml +++ b/contrib/demos/heat/steak-rg.yaml @@ -1,3 +1,4 @@ +--- heat_template_version: 2013-05-23 parameters: diff --git a/contrib/demos/heat/steak.yaml b/contrib/demos/heat/steak.yaml index 9b9bd9fc70..80828316f9 100644 --- a/contrib/demos/heat/steak.yaml +++ b/contrib/demos/heat/steak.yaml @@ -1,3 +1,4 @@ +--- heat_template_version: 2013-05-23 parameters: diff --git a/contrib/demos/magnum/redis-kube/redis-controller.yaml b/contrib/demos/magnum/redis-kube/redis-controller.yaml index 4eaf61eae5..11332e3d47 100644 --- a/contrib/demos/magnum/redis-kube/redis-controller.yaml +++ b/contrib/demos/magnum/redis-kube/redis-controller.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1beta3 kind: ReplicationController metadata: @@ -25,4 +26,3 @@ spec: volumes: - name: data emptyDir: {} - diff --git a/contrib/demos/magnum/redis-kube/redis-master.yaml b/contrib/demos/magnum/redis-kube/redis-master.yaml index 02abada976..cb20426705 100644 --- a/contrib/demos/magnum/redis-kube/redis-master.yaml +++ b/contrib/demos/magnum/redis-kube/redis-master.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1beta3 kind: Pod metadata: diff --git a/contrib/demos/magnum/redis-kube/redis-proxy.yaml b/contrib/demos/magnum/redis-kube/redis-proxy.yaml index 2993a45bf1..03262f8996 100644 --- a/contrib/demos/magnum/redis-kube/redis-proxy.yaml +++ b/contrib/demos/magnum/redis-kube/redis-proxy.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1beta3 kind: Pod metadata: diff --git a/contrib/demos/magnum/redis-kube/redis-sentinel-controller.yaml b/contrib/demos/magnum/redis-kube/redis-sentinel-controller.yaml index 157b09e8a4..65e514a3ed 100644 --- a/contrib/demos/magnum/redis-kube/redis-sentinel-controller.yaml +++ b/contrib/demos/magnum/redis-kube/redis-sentinel-controller.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1beta3 kind: ReplicationController metadata: diff --git a/contrib/demos/magnum/redis-kube/redis-sentinel-service.yaml b/contrib/demos/magnum/redis-kube/redis-sentinel-service.yaml index 7078d182f3..18d7014bb6 100644 --- a/contrib/demos/magnum/redis-kube/redis-sentinel-service.yaml +++ b/contrib/demos/magnum/redis-kube/redis-sentinel-service.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1beta3 kind: Service metadata: diff --git a/releasenotes/notes/congress-broken-cbf8ca59d90a85cb.yaml b/releasenotes/notes/congress-broken-cbf8ca59d90a85cb.yaml index 1ea4e38fda..3172822629 100644 --- a/releasenotes/notes/congress-broken-cbf8ca59d90a85cb.yaml +++ b/releasenotes/notes/congress-broken-cbf8ca59d90a85cb.yaml @@ -1,3 +1,4 @@ +--- other: - Congress doesn't work correctly out of the box and will not deploy. See Bug #1634641.