X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nova-compute-instance.yaml;h=3074228e7559d25eac54519bf875e4418d959557;hb=69f1dcc7cb1f881b9df0d0c5ac0c34627bc1d775;hp=91c9ce695ad9785f56861a76c4442cc0a5662397;hpb=5459cbd167e38a0b7c2d7fa0d72bedb68ce40bad;p=apex-tripleo-heat-templates.git

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 91c9ce69..3074228e 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -1,102 +1,136 @@
 HeatTemplateFormatVersion: '2012-12-12'
 Description: 'Nova Compute'
 Parameters:
+  AdminPassword:
+    Default: unset
+    Description: The password for the keystone admin account, used for monitoring, querying neutron etc.
+    Type: String
+    NoEcho: true
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     Type: String
     Default: default
-  InstanceType:
+  Flavor:
     Description: Use this flavor
     Type: String
     Default: baremetal
   NovaImage:
     Type: String
+    Default: overcloud-compute
   KeystoneHost:
     Type: String
-  ServicePassword:
-    Description: admin_password for setting up auth in nova.
-    Type: String
-  QuantumHost:
+  NeutronHost:
     Type: String
   RabbitHost:
     Type: String
   RabbitPassword:
     Type: String
+    NoEcho: true
   NovaInterfaces:
     Type: String
     Default: eth0
   NovaComputeDriver:
     Type: String
     Default: libvirt.LibvirtDriver
+  NovaComputeLibvirtType:
+    Type: String
+    Default: ''
   NovaApiHost:
     Type: String
+  NovaPassword:
+    Default: unset
+    Description: The password for the nova service account, used by nova-api.
+    Type: String
+    NoEcho: true
   GlanceHost:
     Type: String
   NovaDSN:
     Type: String
-  QuantumDSN:
+  NeutronDSN:
     Type: String
-  QuantumBridgeMappings:
+  NeutronBridgeMappings:
     Type: String
-  QuantumNetworkVLANRanges:
+  NeutronNetworkVLANRanges:
     Type: String
-  QuantumNetworkType:
+  NeutronNetworkType:
     Type: String
-  QuantumEnableTunnelling:
+  NeutronEnableTunnelling:
     Type: String
 Resources:
-  AccessPolicy:
+  ComputeAccessPolicy:
     Type: OS::Heat::AccessPolicy
     Properties:
-      AllowedResources: [ NovaCompute ]
-  User:
+      AllowedResources: [ NovaCompute0 ]
+  ComputeUser:
     Type: AWS::IAM::User
     Properties:
-      Policies: [ { Ref: AccessPolicy } ]
-  Key:
+      Policies: [ { Ref: ComputeAccessPolicy } ]
+  ComputeKey:
     Type: AWS::IAM::AccessKey
     Properties:
       UserName:
-        Ref: User
-  NovaCompute:
-    Type: AWS::EC2::Instance
+        Ref: ComputeUser
+  NovaCompute0:
+    Type: OS::Nova::Server
     Properties:
-      ImageId:
+      image:
         {Ref: NovaImage}
-      InstanceType: {Ref: InstanceType}
-      KeyName: {Ref: KeyName}
+      flavor: {Ref: Flavor}
+      key_name: {Ref: KeyName}
     Metadata:
+      os-collect-config:
+        cfn:
+          access_key_id:
+            Ref: ComputeKey
+          secret_access_key:
+            Fn::GetAtt: [ ComputeKey, SecretAccessKey ]
+          stack_name: {Ref: 'AWS::StackName'}
+          path: NovaCompute0Config.Metadata
       OpenStack::ImageBuilder::Elements: [ nova-compute ]
-      heat: 
-        access_key_id:
-          Ref: Key
-        secret_key:
-          Fn::GetAtt: [ Key, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: NovaCompute
+  NovaCompute0Config:
+    Type: AWS::AutoScaling::LaunchConfiguration
+    Properties:
+      InstanceType: '0'
+      ImageId: '0'
+    Metadata:
+      os-collect-config:
+        cfn:
+          access_key_id:
+            Ref: ComputeKey
+          secret_access_key:
+            Fn::GetAtt: [ ComputeKey, SecretAccessKey ]
+          stack_name: {Ref: 'AWS::StackName'}
+          path: NovaCompute0Config.Metadata
       nova:
         compute_driver: {Ref: NovaComputeDriver}
+        compute_libvirt_type: {Ref: NovaComputeLibvirtType}
         db: {Ref: NovaDSN}
         host: {Ref: NovaApiHost}
+        service-password:
+          Ref: NovaPassword
       glance:
         host: {Ref: GlanceHost}
       keystone:
         host: {Ref: KeystoneHost}
-      quantum:
-        host: {Ref: QuantumHost}
-        ovs_db: {Ref: QuantumDSN}
+      neutron:
+        host: {Ref: NeutronHost}
+        ovs_db: {Ref: NeutronDSN}
         ovs:
-          local_ip: 127.0.0.1
-          tenant_network_type: {Ref: QuantumNetworkType}
-          network_vlan_ranges: {Ref: QuantumNetworkVLANRanges}
-          bridge_mappings: {Ref: QuantumBridgeMappings}
-          enable_tunneling: {Ref: QuantumEnableTunnelling}
-
-      service-password: {Ref: ServicePassword}
-      admin-password: {Ref: ServicePassword}
+          local_ip:
+            Fn::Select:
+              - 0
+              - Fn::Select:
+                - ctlplane
+                - Fn::GetAtt:
+                  - NovaCompute0
+                  - networks
+          tenant_network_type: {Ref: NeutronNetworkType}
+          network_vlan_ranges: {Ref: NeutronNetworkVLANRanges}
+          bridge_mappings: {Ref: NeutronBridgeMappings}
+          enable_tunneling: {Ref: NeutronEnableTunnelling}
+        service-password:
+          Ref: NeutronPassword
+      admin-password: {Ref: AdminPassword}
       rabbit:
         host: {Ref: RabbitHost}
         password: {Ref: RabbitPassword}