Merge "Move memcached deps to bootstrap section for horizon"

kolla_mesos/tests/test_service_definition.py

@@ -101,7 +101,7 @@ class TestValidate(base.BaseTestCase):
                 'run_by': template,
                 'waiters': {}},
             'memcached/daemon': {
-                'waiters': {'daemon': 'test/horizon/daemon'}},
+                'waiters': {'bootstrap': 'test/horizon/bootstrap'}},
             'test/horizon/bootstrap': {
                 'name': 'bootstrap',
                 'registered_by': 'bootstrap',

services/horizon/horizon.yml.j2

@@ -12,9 +12,6 @@ service:
     command: /usr/local/bin/kolla_apache_wrapper.sh
     dependencies:
       - path: horizon/bootstrap
-    {% if enable_memcached | bool %}
-      - path: memcached/daemon
-    {% endif %}
     files:
       apache_wrapper.sh:
         source: config/common/apache_wrapper.sh.j2
@@ -28,6 +25,10 @@ service:
 commands:
   bootstrap:
     command: kolla_extend_start
+    {% if enable_memcached | bool %}
+    dependencies:
+      - path: memcached/daemon
+    {% endif %}
     env:
       KOLLA_BOOTSTRAP:
     files: