aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/heat/templates/_deprecated.yaml1
-rw-r--r--contrib/demos/heat/steak-rg.yaml1
-rw-r--r--contrib/demos/heat/steak.yaml1
-rw-r--r--contrib/demos/magnum/redis-kube/redis-controller.yaml2
-rw-r--r--contrib/demos/magnum/redis-kube/redis-master.yaml1
-rw-r--r--contrib/demos/magnum/redis-kube/redis-proxy.yaml1
-rw-r--r--contrib/demos/magnum/redis-kube/redis-sentinel-controller.yaml1
-rw-r--r--contrib/demos/magnum/redis-kube/redis-sentinel-service.yaml1
-rw-r--r--releasenotes/notes/congress-broken-cbf8ca59d90a85cb.yaml1
9 files changed, 9 insertions, 1 deletions
diff --git a/ansible/roles/heat/templates/_deprecated.yaml b/ansible/roles/heat/templates/_deprecated.yaml
index 76cc8e387..39bac77f3 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 4c0a1db93..516d71049 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 9b9bd9fc7..80828316f 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 4eaf61eae..11332e3d4 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 02abada97..cb2042670 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 2993a45bf..03262f899 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 157b09e8a..65e514a3e 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 7078d182f..18d7014bb 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 1ea4e38fd..317282262 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.