X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fnova-scheduler.yaml;h=ad556e0c35ac22d2b051a7006a2d3d2c8d0343bf;hb=a8d511a05e2f94af177155546bcc5b74ee0329a0;hp=a1a98b4856afcf8aa44696e4597f79683d8cd541;hpb=73a3eb9be5259a43364770b39b57d87520b455fe;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml
index a1a98b48..ad556e0c 100644
--- a/docker/services/nova-scheduler.yaml
+++ b/docker/services/nova-scheduler.yaml
@@ -46,19 +46,22 @@ outputs:
     value:
       service_name: {get_attr: [NovaSchedulerBase, role_data, service_name]}
       config_settings: {get_attr: [NovaSchedulerBase, role_data, config_settings]}
-      step_config: {get_attr: [NovaSchedulerBase, role_data, step_config]}
+      step_config: &step_config
+        get_attr: [NovaSchedulerBase, role_data, step_config]
       service_config_settings: {get_attr: [NovaSchedulerBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       docker_image: &nova_scheduler_image
         list_join:
           - '/'
           - [ {get_param: DockerNamespace}, {get_param: DockerNovaSchedulerImage} ]
-      puppet_tags: nova_config
-      config_volume: nova
-      config_image:
-        list_join:
-        - '/'
-        - [ {get_param: DockerNamespace}, {get_param: DockerNovaBaseImage} ]
+      puppet_config:
+        config_volume: nova
+        puppet_tags: nova_config
+        step_config: *step_config
+        config_image:
+          list_join:
+          - '/'
+          - [ {get_param: DockerNamespace}, {get_param: DockerNovaBaseImage} ]
       kolla_config:
          /var/lib/kolla/config_files/nova_scheduler.json:
            command: /usr/bin/nova-scheduler
@@ -82,3 +85,7 @@ outputs:
               - /etc/localtime:/etc/localtime:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable nova_scheduler service
+          tags: step2
+          service: name=openstack-nova-scheduler state=stopped enabled=no