Merge "Re-Add bigswitch agent support"

[apex-tripleo-heat-templates.git] / docker / services / nova-api.yaml

diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 1c57bbf..e5c78d6 100644 (file)
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -12,7 +12,7 @@ parameters:
     description: image
     default: 'centos-binary-nova-api:latest'
     type: string
-  DockerNovaBaseImage:
+  DockerNovaConfigImage:
     description: image
     default: 'centos-binary-nova-base:latest'
     type: string
@@ -60,7 +60,7 @@ outputs:
         config_image:
           list_join:
           - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaBaseImage} ]
+          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
       kolla_config:
          /var/lib/kolla/config_files/nova_api.json:
            command: /usr/bin/nova-api
@@ -134,8 +134,9 @@ outputs:
               - /etc/localtime:/etc/localtime:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+        step_5:
           nova_api_discover_hosts:
-            start_order: 3
+            start_order: 1
             image: *nova_api_image
             net: host
             detach: false