From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 15 Feb 2017 19:23:33 +0000 (+0000)
Subject: Merge "Add nova service support for composable upgrades"
X-Git-Tag: opnfv-6.0.0~1073
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0f1c1d66eb32630ed9fee936b233ed1ce68b5412;p=apex-tripleo-heat-templates.git

Merge "Add nova service support for composable upgrades"
---

0f1c1d66eb32630ed9fee936b233ed1ce68b5412
diff --cc puppet/services/nova-base.yaml
index 26d05cc9,e6c455e7..d892c36d
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@@ -115,13 -115,7 +115,12 @@@ parameters
      description: >
          Cron to move deleted instances to another table - Until complete
      default: false
 +  NovaPlacementAPIInterface:
 +    type: string
 +    description: >
 +        Endpoint interface to be used for the placement API.
 +    default: 'internal'
  
- 
  conditions:
  
    compute_upgrade_level_empty: {equals : [{get_param: UpgradeLevelNovaCompute}, '']}