Add metadata to configure swift

[apex-tripleo-heat-templates.git] / undercloud-vm.yaml

diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index a127409..a8c82f3 100644 (file)
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -10,6 +10,7 @@ Parameters:
     Default: unset
     Description: The keystone auth secret.
     Type: String
+    NoEcho: true
   BaremetalArch:
     Default: i386
     Description: The architecture to use in Nova-BM - i386 or amd64.
@@ -40,15 +41,19 @@ Parameters:
     Description: The password for the neutron service account, used by neutron agents.
     Type: String
     NoEcho: true
-  NeutronNativePXE:
-    Default: ''
+  NeutronPublicInterface:
+    Default: eth0
+    Description: What interface to bridge onto br-ex for network nodes.
     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
+  PowerManager:
+    Default: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
+    Description: Bare metal power manager driver.
+    Type: String
   PowerUserName:
     Default: stack
     Description: What username to ssh to the virtual power host with.
@@ -75,6 +80,7 @@ Resources:
       ImageId: '0'
       InstanceType: foo
     Metadata:
+      OpenStack::Role: notcomputeConfig
       OpenStack::Heat::Stack: {}
       Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ]
       admin-password:
@@ -94,6 +100,7 @@ Resources:
         volume_size_mb: '5000'
       db-password: unset
       glance:
+        backend: file
         db: mysql://glance:unset@localhost/glance
         host: 127.0.0.1
         service-password:
@@ -105,7 +112,7 @@ Resources:
         admin_user: heat
         auth_encryption_key: unset___________
         db: mysql://heat:unset@localhost/heat
-        heat_watch_server_url:
+        watch_server_url:
           Fn::Join:
             - ''
             - - http://
@@ -147,10 +154,12 @@ Resources:
           ram_allocation_ratio: 1.0
           reserved_host_memory_mb: 0
         baremetal:
+          use_file_injection: "False"
           arch:
             Ref: BaremetalArch
           db: mysql://nova:unset@localhost/nova_bm
-          power_manager: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
+          power_manager:
+            Ref: PowerManager
           pxe_deploy_timeout: 2400
           virtual_power:
             user:
@@ -162,12 +171,11 @@ Resources:
           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]
-          public_interface: eth0
+          public_interface:
+            Ref: NeutronPublicInterface
           physical_bridge: br-ctlplane
           physical_network: ctlplane
           network_vlan_ranges: ctlplane