X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=undercloud-vm.yaml;h=8c948caf3a7a6857c0edc724672c05f0c0f659b9;hb=69f1dcc7cb1f881b9df0d0c5ac0c34627bc1d775;hp=e9f9b3563343803b0a9918d0c857355be3cf3e70;hpb=d65cd33bc0a1d67ed1cdcf40c18c5866b0720a8c;p=apex-tripleo-heat-templates.git

diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index e9f9b356..8c948caf 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -1,22 +1,37 @@
-escription: All-in-one baremetal OpenStack and all dependencies.
+Description: All-in-one baremetal OpenStack and all dependencies.
 HeatTemplateFormatVersion: '2012-12-12'
 Parameters:
   AdminPassword:
     Default: unset
     Description: The password for the keystone admin account, used for monitoring, querying neutron etc.
     Type: String
+    NoEcho: true
   AdminToken:
     Default: unset
     Description: The keystone auth secret.
     Type: String
-  InstanceType:
+  BaremetalArch:
+    Default: i386
+    Description: The architecture to use in Nova-BM - i386 or amd64.
+    Type: String
+  Flavor:
     Default: baremetal
     Description: Flavor to request when deploying.
     Type: String
+  GlancePassword:
+    Default: unset
+    Description: The password for the glance service account, used by the glance services.
+    Type: String
+    NoEcho: true
   KeyName:
     Default: default
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     Type: String
+  HeatPassword:
+    Default: unset
+    Description: The password for the Heat service account, used by the Heat services.
+    Type: String
+    NoEcho: true
   Image:
     Default: undercloud
     Type: String
@@ -24,6 +39,16 @@ Parameters:
     Default: unset
     Description: The password for the neutron service account, used by neutron agents.
     Type: String
+    NoEcho: true
+  NeutronNativePXE:
+    Default: ''
+    Type: String
+    Description: Set truthy to enable Neutron native PXE.
+  NovaPassword:
+    Default: unset
+    Description: The password for the nova service account, used by nova-api.
+    Type: String
+    NoEcho: true
   PowerUserName:
     Default: stack
     Description: What username to ssh to the virtual power host with.
@@ -54,12 +79,16 @@ Resources:
       Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ]
       admin-password:
         Ref: AdminPassword
-      admin-token:
+      admin-token: 
         Ref: AdminToken
       controller-address:
-        Fn::GetAtt:
-          - notcompute
-          - PrivateIp
+        Fn::Select:
+          - 0
+          - Fn::Select:
+            - "ctlplane"
+            - Fn::GetAtt:
+              - notcompute
+              - networks
       cinder:
         db: mysql://cinder:unset@localhost/cinder
         volume_size_mb: '5000'
@@ -67,8 +96,11 @@ Resources:
       glance:
         db: mysql://glance:unset@localhost/glance
         host: 127.0.0.1
+        service-password:
+          Ref: GlancePassword
       heat:
-        admin_password: unset
+        admin_password:
+          Ref: HeatPassword
         admin_tenant_name: service
         admin_user: heat
         auth_encryption_key: unset___________
@@ -77,19 +109,19 @@ Resources:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::GetAtt": [ notcompute, PrivateIp ]}
+              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]}
               - ":8003"
         metadata_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::GetAtt": [ notcompute, PrivateIp ]}
+              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]}
               - ":8000"
         waitcondition_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::GetAtt": [ notcompute, PrivateIp ]}
+              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]}
               - ":8000/v1/waitcondition"
       os-collect-config:
         cfn:
@@ -108,7 +140,7 @@ Resources:
         db: mysql://keystone:unset@localhost/keystone
         host: 127.0.0.1
       nova:
-        compute_hostname: ubuntu
+        compute_hostname: undercloud
         compute_driver: baremetal.driver.BareMetalDriver
         db: mysql://nova:unset@localhost/nova
         host: 127.0.0.1
@@ -117,7 +149,8 @@ Resources:
           ram_allocation_ratio: 1.0
           reserved_host_memory_mb: 0
         baremetal:
-          arch: i386
+          arch:
+            Ref: BaremetalArch
           db: mysql://nova:unset@localhost/nova_bm
           power_manager: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
           pxe_deploy_timeout: 2400
@@ -127,8 +160,12 @@ Resources:
             key: /opt/stack/boot-stack/virtual-power-key
             ssh_host: 192.168.122.1
             type: virsh
+        service-password:
+          Ref: NovaPassword
       neutron:
         host: 127.0.0.1
+        native_pxe:
+          Ref: NeutronNativePXE
         ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
         ovs:
           dnsmasq_range: [192.0.2.25, 192.0.2.44]
@@ -144,20 +181,15 @@ Resources:
       rabbit:
         host: 127.0.0.1
         password: guest
-      swift:
-        store_user: unset
-        store_key: unset
-      service-password: unset
   notcompute:
-    Type: AWS::EC2::Instance
+    Type: OS::Nova::Server
     Properties:
-      ImageId:
+      image:
         Ref: Image
-      InstanceType:
-        Ref: InstanceType
-      KeyName:
+      flavor:
+        Ref: Flavor
+      key_name:
         Ref: KeyName
-    Type: AWS::EC2::Instance
     Metadata:
       os-collect-config:
         cfn: