Closes-Bug: #1459869

Server Manager: contrail_upgrade flag should not be set after re-image
and provision Edit

Issue:
contrail_upgrade flag is set when we provision a target right after
re-image.
This flag needs to be set only when an already provisioned server,
is provisioned with a different image.

Change-Id: If5bcb838658b3e319e337de2bdc26aa399fa1285

src/server_mgr_puppet.py

@@ -1903,7 +1903,10 @@ def add_contrail_upgrade(
         self, server, provision_parameters):
         data = ''
 
-        if server.get('provisioned_id',"") != provision_parameters.get('package_image_id', ""):
+        #Set the flag only when targets image_id is not equal to what it is going
+        #to be provisoned with
+        if server.get('provisioned_id', "") != "" and \
+                  server.get('provisioned_id',"") != provision_parameters.get('package_image_id', ""):
             data += 'contrail::params::contrail_upgrade: %s\n' %(
                            True)