Merge "Replace hardcoded 'br-ex' with NeutronPhysicalBridge parameter."

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

diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index 21910cc..fe2f294 100644 (file)
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Nova API service configured with Puppet
@@ -13,6 +13,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -81,6 +89,8 @@ resources:
   #     ServiceNetMap: {get_param: ServiceNetMap}
   #     DefaultPasswords: {get_param: DefaultPasswords}
   #     EndpointMap: {get_param: EndpointMap}
+  #     RoleName: {get_param: RoleName}
+  #     RoleParameters: {get_param: RoleParameters}
   #     EnableInternalTLS: {get_param: EnableInternalTLS}
 
   NovaBase:
@@ -89,6 +99,8 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
@@ -198,7 +210,7 @@ outputs:
           register: bootstrap_node
         - name: set is_bootstrap_node fact
           tags: common
-          set_fact: is_bootstrap_node={{bootstrap_node.stdout == ansible_hostname}}
+          set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
         - name: Extra migration for nova tripleo/+bug/1656791
           tags: step0,pre-upgrade
           when: is_bootstrap_node