Merge "FQDN validation"

[apex-tripleo-heat-templates.git] / puppet / services / nova-conductor.yaml

diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml
index 7b08653..4574cae 100644 (file)
--- a/puppet/services/nova-conductor.yaml
+++ b/puppet/services/nova-conductor.yaml
@@ -67,15 +67,12 @@ outputs:
         include tripleo::profile::base::nova::conductor
       upgrade_tasks:
         - name: Stop nova_conductor service
-          tags: step2
+          tags: step1
           service: name=openstack-nova-conductor state=stopped
-        - name: update nova conductor
-          tags: step2
-          yum: name=openstack-nova-conductor state=latest
         # If not already set by puppet (e.g a pre-ocata version), set the
         # upgrade_level for compute to "auto"
         - name: Set compute upgrade level to auto
-          tags: step3
+          tags: step1
           ini_file:
             str_replace:
               template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"