Fix checksum annotations in heat and horizon

Change-Id: Ief0f88791813f2b0f60ed6f29e720a603a119520

openstack_operator/templates/heat/deployment.yml.j2

@@ -35,8 +35,8 @@ spec:
     metadata:
       labels:
         {{ labels("heat", name, component) | indent(8) }}
-    annotations:
+      annotations:
-      checksum/config: "{{ config_hash }}"
+        checksum/config: "{{ config_hash }}"
     spec:
       containers:
       - name: heat-{{ component }}

openstack_operator/templates/horizon/deployment.yml.j2

@@ -29,8 +29,8 @@ spec:
     metadata:
       labels:
         {{ labels("horizon", name) | indent(8) }}
-    annotations:
+      annotations:
-      checksum/config: "{{ config_hash }}"
+        checksum/config: "{{ config_hash }}"
     spec:
       containers:
       - name: horizon

playbooks/functional/tests/memcached.yaml

@@ -25,7 +25,7 @@
   command: kubectl get pods -l app.kubernetes.io/name=memcached,app.kubernetes.io/instance=devstack -o=jsonpath='{range .items[*]}{.status.podIP}{"\n"}{end}'
   register: _memcached_ips
   until: _memcached_ips is success
-  retries: 20
+  retries: 60
   delay: 5
   failed_when: |
     {{ _memcached_ips.stdout_lines | length == 0 }} or
@@ -38,7 +38,7 @@
   register: _metrics
   loop: "{{ _memcached_ips.stdout_lines }}"
   until: _metrics is success
-  retries: 60
+  retries: 10
   delay: 5
   failed_when: "'memcached_up 1' not in _metrics.content"