Add metadata to configure swift

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

diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index 7bcc8f2..a8c82f3 100644 (file)
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -5,10 +5,12 @@ Parameters:
     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
+    NoEcho: true
   BaremetalArch:
     Default: i386
     Description: The architecture to use in Nova-BM - i386 or amd64.
@@ -21,6 +23,7 @@ Parameters:
     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
@@ -29,6 +32,7 @@ Parameters:
     Default: unset
     Description: The password for the Heat service account, used by the Heat services.
     Type: String
+    NoEcho: true
   Image:
     Default: undercloud
     Type: String
@@ -36,10 +40,20 @@ Parameters:
     Default: unset
     Description: The password for the neutron service account, used by neutron agents.
     Type: String
+    NoEcho: true
+  NeutronPublicInterface:
+    Default: eth0
+    Description: What interface to bridge onto br-ex for network nodes.
+    Type: String
   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.
@@ -66,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:
@@ -73,14 +88,19 @@ Resources:
       admin-token: 
         Ref: AdminToken
       controller-address:
-        Fn::GetAtt:
-          - notcompute
-          - first_private_address
+        Fn::Select:
+          - 0
+          - Fn::Select:
+            - "ctlplane"
+            - Fn::GetAtt:
+              - notcompute
+              - networks
       cinder:
         db: mysql://cinder:unset@localhost/cinder
         volume_size_mb: '5000'
       db-password: unset
       glance:
+        backend: file
         db: mysql://glance:unset@localhost/glance
         host: 127.0.0.1
         service-password:
@@ -92,23 +112,23 @@ Resources:
         admin_user: heat
         auth_encryption_key: unset___________
         db: mysql://heat:unset@localhost/heat
-        heat_watch_server_url:
+        watch_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::GetAtt": [ notcompute, first_private_address ]}
+              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]}
               - ":8003"
         metadata_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::GetAtt": [ notcompute, first_private_address ]}
+              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]}
               - ":8000"
         waitcondition_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::GetAtt": [ notcompute, first_private_address ]}
+              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]}
               - ":8000/v1/waitcondition"
       os-collect-config:
         cfn:
@@ -121,13 +141,11 @@ Resources:
             - SecretAccessKey
           stack_name:
             Ref: AWS::StackName
-      interfaces:
-        control: eth2
       keystone:
         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
@@ -136,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:
@@ -154,7 +174,8 @@ Resources:
         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