4 files changed, 211 insertions, 2 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-heat/autoscaling_example.template b/meta-openstack/recipes-devtools/python/python-heat/autoscaling_example.template
new file mode 100644
index 0000000..6391187
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-heat/autoscaling_example.template
@@ -0,0 +1,66 @@
+heat_template_version: 2014-05-06
+description: AutoScaling
+parameters:
+  instance_type:
+    type: string
+    description: Type of the instance to be created.
+    default: m1.tiny
+    constraints:
+      - allowed_values: [m1.tiny, m1.small, m1.medium, m1.large]
+        description:
+          Value must be one of 'm1.tiny', 'm1.small', 'm1.medium' or 'm1.large'.
+  image_id:
+    type: string
+    description: ID of the image to use for the instance to be created.
+    default: myfirstimage
+resources:
+  web_server_group_launch_conf:
+     type: AWS::AutoScaling::LaunchConfiguration
+     properties:
+       ImageId: { get_param: image_id }
+       InstanceType: { get_param: instance_type }
+  server_group:
+    type: AWS::AutoScaling::AutoScalingGroup
+    properties:
+      AvailabilityZones: ["RegionOne"]
+      MinSize: '1'
+      MaxSize: '3'
+      LaunchConfigurationName: {get_resource: web_server_group_launch_conf}
+  web_server_scaleup_policy:
+    type: AWS::AutoScaling::ScalingPolicy
+    properties:
+      AdjustmentType: ChangeInCapacity
+      AutoScalingGroupName: {get_resource: server_group}
+      Cooldown: 60
+      ScalingAdjustment: 1
+  web_server_scaledown_policy:
+    type: AWS::AutoScaling::ScalingPolicy
+    properties:
+      AdjustmentType: ChangeInCapacity
+      AutoScalingGroupName: {get_resource: server_group}
+      Cooldown: 60
+      ScalingAdjustment: -1
+  cpu_alarm_high:
+    type: OS::Ceilometer::Alarm
+    properties:
+      description: Scale-up if the average CPU > 80% for 5 minute
+      meter_name: cpu_util
+      statistic: avg
+      period: '300'
+      evaluation_periods: '1'
+      threshold: '80'
+      alarm_actions:
+        - {get_attr: [web_server_scaleup_policy, AlarmUrl]}
+      comparison_operator: gt
+  cpu_alarm_low:
+    type: OS::Ceilometer::Alarm
+    properties:
+      description: Scale-down if the average CPU < 45% for 2 minutes
+      meter_name: cpu_util
+      statistic: avg
+      period: '120'
+      evaluation_periods: '1'
+      threshold: '45'
+      alarm_actions:
+        - {get_attr: [web_server_scaledown_policy, AlarmUrl]}
+      comparison_operator: lt
diff --git a/meta-openstack/recipes-devtools/python/python-heat/one_vm_example.template b/meta-openstack/recipes-devtools/python/python-heat/one_vm_example.template
new file mode 100644
index 0000000..07d6e6d
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-heat/one_vm_example.template
@@ -0,0 +1,63 @@
+heat_template_version: 2014-05-06
+description: Template to deploy one VM
+parameters:
+  vm_type:
+    type: string
+    description: Type of the instance to be created.
+    default: m1.tiny
+    constraints:
+      - allowed_values: [m1.tiny, m1.small, m1.medium, m1.large]
+        description:
+          Value must be one of 'm1.tiny', 'm1.small', 'm1.medium' or 'm1.large'.
+  image_id:
+    type: string
+    description: ID of the image to use for VM to be created.
+    default: myfirstimage
+  vol_1_size:
+    type: number
+    description: Size of the volume to be created.
+    default: 1
+    constraints:
+      - range: { min: 1, max: 1024 }
+        description: must be between 1 and 1024 Gb.
+  vol_1_type:
+    type: string
+    description: Cinder backend type
+    default: lvm_iscsi
+    constraints:
+      - allowed_values: [lvm_iscsi, nfs, glusterfs, cephrbd]
+        description:
+          Value must be one of 'lvm_iscsi', 'nfs', 'glusterfs' or 'cephrbd'.
+  vol_2_id:
+    type: string
+    description: Cinder existing volume id
+resources:
+  vm_1:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: image_id }
+      flavor: { get_param: vm_type }
+  vol_1:
+    type: OS::Cinder::Volume
+    properties:
+      size: { get_param: vol_1_size }
+      volume_type: { get_param: vol_1_type }
+  vol_1_attachment:
+    type: OS::Cinder::VolumeAttachment
+    properties:
+      volume_id: { get_resource: vol_1 }
+      instance_uuid: { get_resource: vm_1 }
+      mountpoint: /dev/vdb
+  vol_2_attachment:
+    type: OS::Cinder::VolumeAttachment
+    properties:
+      volume_id: { get_param: vol_2_id }
+      instance_uuid: { get_resource: vm_1 }
+      mountpoint: /dev/vdc
+outputs:
+  vm_1_instance_ip:
+    description: Public IP address of VM 1.
+    value: { get_attr: [vm_1, first_address] }
+  vm_1_show:
+    description: Show details of VM 1.
+    value: { get_attr: [vm_1, show] }
diff --git a/meta-openstack/recipes-devtools/python/python-heat/two_vms_example.template b/meta-openstack/recipes-devtools/python/python-heat/two_vms_example.template
new file mode 100644
index 0000000..9690e5a
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-heat/two_vms_example.template
@@ -0,0 +1,74 @@
+heat_template_version: 2014-05-06
+description: Template to deploy two VMs
+parameters:
+  vm_type:
+    type: string
+    description: Type of the instance to be created.
+    default: m1.tiny
+    constraints:
+      - allowed_values: [m1.tiny, m1.small, m1.medium, m1.large]
+        description:
+          Value must be one of 'm1.tiny', 'm1.small', 'm1.medium' or 'm1.large'.
+  image_id:
+    type: string
+    description: ID of the image to use for 2 VMs to be created.
+    default: myfirstimage
+  vol_1_size:
+    type: number
+    description: Size of the volume to be created.
+    default: 1
+    constraints:
+      - range: { min: 1, max: 1024 }
+        description: must be between 1 and 1024 Gb.
+  vol_1_type:
+    type: string
+    description: Cinder backend type
+    default: lvm_iscsi
+    constraints:
+      - allowed_values: [lvm_iscsi, nfs, glusterfs, cephrbd]
+        description:
+          Value must be one of 'lvm_iscsi', 'nfs', 'glusterfs' or 'cephrbd'.
+  vol_2_id:
+    type: string
+    description: Cinder existing volume id
+resources:
+  vm_1:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: image_id }
+      flavor: { get_param: vm_type }
+  vm_2:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: image_id }
+      flavor: { get_param: vm_type }
+  vol_1:
+    type: OS::Cinder::Volume
+    properties:
+      size: { get_param: vol_1_size }
+      volume_type: { get_param: vol_1_type }
+  vol_1_attachment:
+    type: OS::Cinder::VolumeAttachment
+    properties:
+      volume_id: { get_resource: vol_1 }
+      instance_uuid: { get_resource: vm_1 }
+      mountpoint: /dev/vdb
+  vol_2_attachment:
+    type: OS::Cinder::VolumeAttachment
+    properties:
+      volume_id: { get_param: vol_2_id }
+      instance_uuid: { get_resource: vm_1 }
+      mountpoint: /dev/vdc
+outputs:
+  vm_1_instance_ip:
+    description: Public IP address of VM 1.
+    value: { get_attr: [vm_1, first_address] }
+  vm_1_show:
+    description: Show details of VM 1.
+    value: { get_attr: [vm_1, show] }
+  vm_2_instance_ip:
+    description: Public IP address of VM 2.
+    value: { get_attr: [vm_2, first_address] }
+  vm_2_show:
+    description: Show details of VM 2.
+    value: { get_attr: [vm_2, show] }
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index b5dd958..94ea031 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -10,6 +10,9 @@ SRCNAME = "heat"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
            file://heat.conf \
            file://heat.init \
+           file://autoscaling_example.template \
+           file://one_vm_example.template \
+           file://two_vms_example.template \
 "
 
 SRCREV="58de9e6415f5bdabde708c8584b21b59b7e96a88"
@@ -25,6 +28,7 @@ do_install_append() {
     install -m 600 ${TEMPLATE_CONF_DIR}/*.json ${HEAT_CONF_DIR}
     install -d ${HEAT_CONF_DIR}/templates
     install -m 600 ${TEMPLATE_CONF_DIR}/templates/* ${HEAT_CONF_DIR}/templates
+    install -m 600 ${WORKDIR}/*.template ${HEAT_CONF_DIR}/templates
     install -d ${HEAT_CONF_DIR}/environment.d
     install -m 600 ${TEMPLATE_CONF_DIR}/environment.d/* ${HEAT_CONF_DIR}/environment.d
     install -m 664 ${TEMPLATE_CONF_DIR}/api-paste.ini ${HEAT_CONF_DIR}
@@ -82,7 +86,7 @@ pkg_postinst_${SRCNAME}-setup () {
 
 inherit setuptools identity hosts update-rc.d default_configs
 
-PACKAGES += "${SRCNAME}-tests ${SRCNAME}-common ${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine"
+PACKAGES += "${SRCNAME}-tests ${SRCNAME}-templates ${SRCNAME}-common ${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine"
 PACKAGES += "${SRCNAME}-setup"
 
 ALLOW_EMPTY_${SRCNAME}-setup = "1"
@@ -91,6 +95,8 @@ FILES_${PN} = "${libdir}/*"
 
 FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
 
+FILES_${SRCNAME}-templates = "${sysconfdir}/${SRCNAME}/templates/*"
+
 FILES_${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \
 "
 
@@ -157,7 +163,7 @@ RDEPENDS_${PN} += " \
         python-pbr \
         "
 
-RDEPENDS_${SRCNAME}-engine = "${PN} ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt"
+RDEPENDS_${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt"
 RDEPENDS_${SRCNAME}-api = "${SRCNAME}-engine"
 RDEPENDS_${SRCNAME}-api-cfn = "${SRCNAME}-engine"
 RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-engine"