Merge "Add nova service support for composable upgrades"

diff --cc puppet/services/nova-api.yaml
Simple merge

diff --cc puppet/services/nova-base.yaml
index 26d05cc,e6c455e..d892c36
--- 1/puppet/services/nova-base.yaml
--- 2/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}, '']}