X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-ironic.yaml;h=843f44c5a961db199e024c093316b78baca1dca9;hb=82db6ab608b29e455fb2036aeb36537148b97cf9;hp=bf7639ddaddf650cd8448474de7e12233c1a7fed;hpb=0ecb075814375ec413e4c7e7ca1ed982512c16bd;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-ironic.yaml b/puppet/services/nova-ironic.yaml
index bf7639dd..843f44c5 100644
--- a/puppet/services/nova-ironic.yaml
+++ b/puppet/services/nova-ironic.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Nova Compute service configured with Puppet and using Ironic
@@ -42,10 +42,10 @@ outputs:
           - nova::compute::force_config_drive: true
             nova::compute::reserved_host_memory: '0'
             nova::compute::vnc_enabled: false
-            nova::ironic::common::admin_password: {get_param: IronicPassword}
-            nova::ironic::common::admin_tenant_name: 'service'
-            nova::ironic::common::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri]}
-            nova::ironic::common::admin_username: 'ironic'
+            nova::ironic::common::password: {get_param: IronicPassword}
+            nova::ironic::common::project_name: 'service'
+            nova::ironic::common::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+            nova::ironic::common::username: 'ironic'
             nova::ironic::common::api_endpoint: {get_param: [EndpointMap, IronicInternal, uri]}
             nova::network::neutron::dhcp_domain: ''
             nova::scheduler::filter::scheduler_host_manager: 'ironic_host_manager'