aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-05-23 15:49:41 -0700
committerClint Byrum <clint@fewbar.com>2013-06-06 09:40:16 -0700
commita96fefd92fd5ee80f83f0d6c16607c3c13627b8e (patch)
tree5bbc7d5238bdf2427f382f12b2b0e21798c73dc2
parent5eadb8b0add980ffe51a6e3acbba291ac6007184 (diff)
Nested stack of nova-compute-instance.yaml
-rw-r--r--nova-compute-group.yaml61
-rw-r--r--nova-compute-instance.yaml17
2 files changed, 78 insertions, 0 deletions
diff --git a/nova-compute-group.yaml b/nova-compute-group.yaml
new file mode 100644
index 00000000..b1ffa211
--- /dev/null
+++ b/nova-compute-group.yaml
@@ -0,0 +1,61 @@
+HeatTemplateFormatVersion: '2012-12-12'
+Description: 'Group of Nova Computes'
+Parameters:
+ KeyName:
+ Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
+ Type: String
+ Default: default
+ InstanceType:
+ Description: Use this flavor
+ Type: String
+ Default: baremetal
+ NovaImage:
+ Type: String
+ KeystoneHost:
+ Type: String
+ ServicePassword:
+ Description: admin_password for setting up auth in nova.
+ Type: String
+ QuantumHost:
+ Type: String
+ RabbitHost:
+ Type: String
+ RabbitPassword:
+ Type: String
+ NovaInterfaces:
+ Type: String
+ Default: eth0
+ NovaComputeDriver:
+ Type: String
+ Default: libvirt.LibvirtDriver
+ NovaApiHost:
+ Type: String
+ GlanceHost:
+ Type: String
+ NovaComputeTemplate:
+ Type: String
+ Default: https://raw.github.com/SpamapS/templates/MERGE/nova-compute-instance.yaml
+ NovaDSN:
+ Type: String
+ QuantumDSN:
+ Type: String
+Resources:
+ NovaCompute0:
+ Type: AWS::CloudFormation::Stack
+ Properties:
+ Parameters:
+ NovaImage: {Ref: NovaImage}
+ InstanceType: {Ref: InstanceType}
+ KeyName: {Ref: KeyName}
+ KeystoneHost: {Ref: KeystoneHost}
+ ServicePassword: {Ref: ServicePassword}
+ QuantumHost: {Ref: QuantumHost}
+ RabbitHost: {Ref: RabbitHost}
+ RabbitPassword: {Ref: RabbitPassword}
+ NovaInterfaces: {Ref: NovaInterfaces}
+ NovaComputeDriver: {Ref: NovaComputeDriver}
+ NovaApiHost: {Ref: NovaApiHost}
+ GlanceHost: {Ref: GlanceHost}
+ NovaDSN: {Ref: NovaDSN}
+ QuantumDSN: {Ref: QuantumDSN}
+ TemplateURL: {Ref: NovaComputeTemplate}
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 2c9b838a..f508377a 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -28,8 +28,14 @@ Parameters:
NovaComputeDriver:
Type: String
Default: libvirt.LibvirtDriver
+ NovaApiHost:
+ Type: String
GlanceHost:
Type: String
+ NovaDSN:
+ Type: String
+ QuantumDSN:
+ Type: String
Resources:
AccessPolicy:
Type: OS::Heat::AccessPolicy
@@ -65,12 +71,23 @@ Resources:
- resource: NovaCompute
nova:
compute_driver: {Ref: NovaComputeDriver}
+ db: {Ref: NovaDSN}
+ host: {Ref: NovaApiHost}
glance:
host: {Ref: GlanceHost}
keystone:
host: {Ref: KeystoneHost}
quantum:
host: {Ref: QuantumHost}
+ ovs_db: {Ref: QuantumDSN}
+ ovs:
+ local_ip:
+ Fn::GetAtt: [ NovaCompute, PrivateIp ]
+ tenant_network_type: gre
+ network_vlan_ranges: ''
+ bridge_mappings: ''
+ enable_tunneling: 'True'
+
service-password: {Ref: ServicePassword}
admin-password: {Ref: ServicePassword}
rabbit: