Pre-bake cftools into an image
After this change, new JEOS will need to be created since the JEOS names have changed. For a cfntool image: heat jeos_create F16 x86_64 cftools For a gold image: heat jeos_create F16 x86_64 gold Signed-off-by: Steven Dake <sdake@redhat.com>
This commit is contained in:
Steven Dake
parent
2915c99d46
commit
ebdf76e1e8
@ -7,6 +7,7 @@ include babel.cfg
|
||||
graft templates
|
||||
include heat/jeos/F16-x86_64-gold-jeos.tdl
|
||||
include heat/jeos/F17-x86_64-gold-jeos.tdl
|
||||
include heat/jeos/F16-x86_64-cftools-jeos.tdl
|
||||
include heat/db/sqlalchemy/migrate_repo/migrate.cfg
|
||||
graft etc
|
||||
graft docs
|
||||
|
||||
28
bin/heat
28
bin/heat
@ -216,19 +216,29 @@ def jeos_create(options, arguments):
|
||||
if os.geteuid() != 0:
|
||||
print "jeos_create must be run as root"
|
||||
sys.exit(1)
|
||||
if len(arguments) < 2:
|
||||
print '\n Please provide the distro and arch'
|
||||
print ' Usage:\n heat jeos_create <distro> <arch>'
|
||||
if len(arguments) < 3:
|
||||
print '\n Please provide the distro, arch, and instance type.'
|
||||
print ' Usage:'
|
||||
print ' heat jeos_create <distro> <arch> <instancetype>'
|
||||
print ' instance type can be:'
|
||||
print ' gold builds a base image where userdata is used to initialize the instance'
|
||||
print ' cftools builds a base image where AWS CloudFormations tools are present'
|
||||
sys.exit(1)
|
||||
|
||||
distro = arguments.pop(0)
|
||||
arch = arguments.pop(0)
|
||||
instance_type = arguments.pop(0)
|
||||
|
||||
if not arch in ['x86_64', 'i686']:
|
||||
print 'arch %s not supported' % arch
|
||||
print 'try: x86_64 os i686'
|
||||
sys.exit(1)
|
||||
|
||||
if not instance_type in ('gold', 'cftools'):
|
||||
print 'A JEOS instance type of %s not supported' % instance_type
|
||||
print 'try: gold or cftools'
|
||||
sys.exit(1)
|
||||
|
||||
iso = None
|
||||
if distro == 'F16':
|
||||
iso = '/var/lib/libvirt/images/Fedora-16-x86_64-DVD.iso'
|
||||
@ -248,16 +258,16 @@ def jeos_create(options, arguments):
|
||||
print '*** %s does not exist.' % (iso)
|
||||
sys.exit(1)
|
||||
|
||||
tdl_path = '%s/heat/jeos/%s-%s-gold-jeos.tdl' % (get_python_lib(), distro, arch)
|
||||
dsk_filename = '/var/lib/libvirt/images/%s-%s-gold-jeos.dsk' % (distro, arch)
|
||||
qcow2_filename = '/var/lib/libvirt/images/%s-%s-gold-jeos.qcow2' % (distro, arch)
|
||||
image_name = '%s-%s' % (distro, arch)
|
||||
tdl_path = '%s/heat/jeos/%s-%s-%s-jeos.tdl' % (get_python_lib(), distro, arch, instance_type)
|
||||
dsk_filename = '/var/lib/libvirt/images/%s-%s-%s-jeos.dsk' % (distro, arch, instance_type)
|
||||
qcow2_filename = '/var/lib/libvirt/images/%s-%s-%s-jeos.qcow2' % (distro, arch, instance_type)
|
||||
image_name = '%s-%s-%s' % (distro, arch, instance_type)
|
||||
|
||||
if not os.access(tdl_path, os.R_OK):
|
||||
print 'The tdl for that disto/arch is not available'
|
||||
sys.exit(1)
|
||||
|
||||
print 'Creating JEOS image - this takes approximately 10 minutes.'
|
||||
print 'Creating JEOS image (%s) - this takes approximately 10 minutes.' % image_name
|
||||
extra_opts = ' '
|
||||
if options.debug:
|
||||
extra_opts = ' -d 3 '
|
||||
@ -272,7 +282,7 @@ def jeos_create(options, arguments):
|
||||
print 'Converting raw disk image to a qcow2 image.'
|
||||
os.system("qemu-img convert -O qcow2 %s %s" % (dsk_filename, qcow2_filename))
|
||||
|
||||
print 'Registering JEOS image with OpenStack Glance.'
|
||||
print 'Registering JEOS image (%s) with OpenStack Glance.' % image_name
|
||||
|
||||
creds = dict(username=options.username,
|
||||
password=options.password,
|
||||
|
||||
@ -144,6 +144,7 @@ This package contains the OpenStack integration for the Heat project
|
||||
%defattr(-,root,root,-)
|
||||
%{python_sitelib}/heat/jeos/F16-x86_64-gold-jeos.tdl
|
||||
%{python_sitelib}/heat/jeos/F17-x86_64-gold-jeos.tdl
|
||||
%{python_sitelib}/heat/jeos/F16-x86_64-cftools-jeos.tdl
|
||||
|
||||
%files openstack
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
@ -82,12 +82,12 @@
|
||||
"cc1.4xlarge" : { "Arch" : "64" }
|
||||
},
|
||||
"DistroArch2AMI": {
|
||||
"F16" : { "32" : "F16-i686", "64" : "F16-x86_64" },
|
||||
"F17" : { "32" : "F17-i686", "64" : "F17-x86_64" },
|
||||
"U10" : { "32" : "U10-i686", "64" : "U10-x86_64" },
|
||||
"RHEL-6.1" : { "32" : "rhel61-i686", "64" : "rhel61-x86_64" },
|
||||
"RHEL-6.2" : { "32" : "rhel62-i686", "64" : "rhel62-x86_64" },
|
||||
"RHEL-6.3" : { "32" : "rhel63-i686", "64" : "rhel63-x86_64" }
|
||||
"F16" : { "32" : "F16-i686", "64" : "F16-x86_64-gold" },
|
||||
"F17" : { "32" : "F17-i686", "64" : "F17-x86_64-gold" },
|
||||
"U10" : { "32" : "U10-i686", "64" : "U10-x86_64-gold" },
|
||||
"RHEL-6.1" : { "32" : "rhel61-i686", "64" : "rhel61-x86_64-gold" },
|
||||
"RHEL-6.2" : { "32" : "rhel62-i686", "64" : "rhel62-x86_64-gold" },
|
||||
"RHEL-6.3" : { "32" : "rhel63-i686", "64" : "rhel63-x86_64-gold" }
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@ -49,12 +49,12 @@
|
||||
"cc1.4xlarge" : { "Arch" : "64" }
|
||||
},
|
||||
"DistroArch2AMI": {
|
||||
"F16" : { "32" : "F16-i686", "64" : "F16-x86_64" },
|
||||
"F17" : { "32" : "F17-i686", "64" : "F17-x86_64" },
|
||||
"U10" : { "32" : "U10-i686", "64" : "U10-x86_64" },
|
||||
"RHEL-6.1" : { "32" : "rhel61-i686", "64" : "rhel61-x86_64" },
|
||||
"RHEL-6.2" : { "32" : "rhel62-i686", "64" : "rhel62-x86_64" },
|
||||
"RHEL-6.3" : { "32" : "rhel63-i686", "64" : "rhel63-x86_64" }
|
||||
"F16" : { "32" : "F16-i686", "64" : "F16-x86_64-gold" },
|
||||
"F17" : { "32" : "F17-i686", "64" : "F17-x86_64-gold" },
|
||||
"U10" : { "32" : "U10-i686", "64" : "U10-x86_64-gold" },
|
||||
"RHEL-6.1" : { "32" : "rhel61-i686", "64" : "rhel61-x86_64-gold" },
|
||||
"RHEL-6.2" : { "32" : "rhel62-i686", "64" : "rhel62-x86_64-gold" },
|
||||
"RHEL-6.3" : { "32" : "rhel63-i686", "64" : "rhel63-x86_64-gold" }
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
148
templates/WordPress_Single_Instance_cftools.template
Normal file
148
templates/WordPress_Single_Instance_cftools.template
Normal file
@ -0,0 +1,148 @@
|
||||
{
|
||||
"AWSTemplateFormatVersion" : "2010-09-09",
|
||||
|
||||
"Description" : "AWS CloudFormation Sample Template WordPress_Single_Instance: WordPress is web software you can use to create a beautiful website or blog. This template installs a single-instance WordPress deployment using a local MySQL database to store the data.",
|
||||
|
||||
"Parameters" : {
|
||||
|
||||
"KeyName" : {
|
||||
"Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
|
||||
"Type" : "String"
|
||||
},
|
||||
|
||||
"InstanceType" : {
|
||||
"Description" : "WebServer EC2 instance type",
|
||||
"Type" : "String",
|
||||
"Default" : "m1.large",
|
||||
"AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ],
|
||||
"ConstraintDescription" : "must be a valid EC2 instance type."
|
||||
},
|
||||
|
||||
"DBName": {
|
||||
"Default": "wordpress",
|
||||
"Description" : "The WordPress database name",
|
||||
"Type": "String",
|
||||
"MinLength": "1",
|
||||
"MaxLength": "64",
|
||||
"AllowedPattern" : "[a-zA-Z][a-zA-Z0-9]*",
|
||||
"ConstraintDescription" : "must begin with a letter and contain only alphanumeric characters."
|
||||
},
|
||||
|
||||
"DBUsername": {
|
||||
"Default": "admin",
|
||||
"NoEcho": "true",
|
||||
"Description" : "The WordPress database admin account username",
|
||||
"Type": "String",
|
||||
"MinLength": "1",
|
||||
"MaxLength": "16",
|
||||
"AllowedPattern" : "[a-zA-Z][a-zA-Z0-9]*",
|
||||
"ConstraintDescription" : "must begin with a letter and contain only alphanumeric characters."
|
||||
},
|
||||
|
||||
"DBPassword": {
|
||||
"Default": "admin",
|
||||
"NoEcho": "true",
|
||||
"Description" : "The WordPress database admin account password",
|
||||
"Type": "String",
|
||||
"MinLength": "1",
|
||||
"MaxLength": "41",
|
||||
"AllowedPattern" : "[a-zA-Z0-9]*",
|
||||
"ConstraintDescription" : "must contain only alphanumeric characters."
|
||||
},
|
||||
|
||||
"DBRootPassword": {
|
||||
"Default": "admin",
|
||||
"NoEcho": "true",
|
||||
"Description" : "Root password for MySQL",
|
||||
"Type": "String",
|
||||
"MinLength": "1",
|
||||
"MaxLength": "41",
|
||||
"AllowedPattern" : "[a-zA-Z0-9]*",
|
||||
"ConstraintDescription" : "must contain only alphanumeric characters."
|
||||
},
|
||||
"LinuxDistribution": {
|
||||
"Default": "F16",
|
||||
"Description" : "Distribution of choice",
|
||||
"Type": "String",
|
||||
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
|
||||
}
|
||||
},
|
||||
|
||||
"Mappings" : {
|
||||
"AWSInstanceType2Arch" : {
|
||||
"t1.micro" : { "Arch" : "32" },
|
||||
"m1.small" : { "Arch" : "32" },
|
||||
"m1.large" : { "Arch" : "64" },
|
||||
"m1.xlarge" : { "Arch" : "64" },
|
||||
"m2.xlarge" : { "Arch" : "64" },
|
||||
"m2.2xlarge" : { "Arch" : "64" },
|
||||
"m2.4xlarge" : { "Arch" : "64" },
|
||||
"c1.medium" : { "Arch" : "32" },
|
||||
"c1.xlarge" : { "Arch" : "64" },
|
||||
"cc1.4xlarge" : { "Arch" : "64" }
|
||||
},
|
||||
"DistroArch2AMI": {
|
||||
"F16" : { "32" : "F16-i686", "64" : "F16-x86_64-cftools" },
|
||||
"F17" : { "32" : "F17-i686", "64" : "F17-x86_64-cftools" },
|
||||
"U10" : { "32" : "U10-i686", "64" : "U10-x86_64-cftools" },
|
||||
"RHEL-6.1" : { "32" : "rhel61-i686", "64" : "rhel61-x86_64-cftools" },
|
||||
"RHEL-6.2" : { "32" : "rhel62-i686", "64" : "rhel62-x86_64-cftools" },
|
||||
"RHEL-6.3" : { "32" : "rhel63-i686", "64" : "rhel63-x86_64-cftools" }
|
||||
}
|
||||
},
|
||||
|
||||
"Resources" : {
|
||||
|
||||
"WebServer": {
|
||||
"Type": "AWS::EC2::Instance",
|
||||
"Metadata" : {
|
||||
"AWS::CloudFormation::Init" : {
|
||||
"config" : {
|
||||
"packages" : {
|
||||
"yum" : {
|
||||
"httpd" : [],
|
||||
"mysql" : [],
|
||||
"mysql-server" : [],
|
||||
"wordpress" : []
|
||||
}
|
||||
},
|
||||
"services" : {
|
||||
"systemd" : {
|
||||
"httpd" : { "enabled" : "true", "ensureRunning" : "true" },
|
||||
"mysqld" : { "enabled" : "true", "ensureRunning" : "true" }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"Properties": {
|
||||
"ImageId" : { "Fn::FindInMap" : [ "DistroArch2AMI", { "Ref" : "LinuxDistribution" },
|
||||
{ "Fn::FindInMap" : [ "AWSInstanceType2Arch", { "Ref" : "InstanceType" }, "Arch" ] } ] },
|
||||
"InstanceType" : { "Ref" : "InstanceType" },
|
||||
"KeyName" : { "Ref" : "KeyName" },
|
||||
"UserData" : { "Fn::Base64" : { "Fn::Join" : ["", [
|
||||
"#!/bin/bash -v\n",
|
||||
"# Setup MySQL root password and create a user\n",
|
||||
"mysqladmin -u root password '", { "Ref" : "DBRootPassword" }, "'\n",
|
||||
"cat >> /tmp/mysql-wordpress-config << EOF\n",
|
||||
"CREATE DATABASE ", { "Ref" : "DBName" }, ";\n",
|
||||
"GRANT ALL PRIVILEGES ON ", { "Ref" : "DBName" }, ".* TO \"", { "Ref" : "DBUsername" }, "\"@\"localhost\"\n",
|
||||
"IDENTIFIED BY \"", { "Ref" : "DBPassword" }, "\";\n",
|
||||
"FLUSH PRIVILEGES;\n",
|
||||
"EXIT\n",
|
||||
"EOF\n",
|
||||
"cat /tmp/mysql-wordpress-config | mysql -u root --password='", { "Ref" : "DBRootPassword" }, "' < /tmp/mysql-wordpress-config\n",
|
||||
"sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ /usr/share/wordpress/wp-config.php\n",
|
||||
"cp /usr/share/wordpress/wp-config.php /usr/share/wordpress/wp-config.orig\n"
|
||||
]]}}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"Outputs" : {
|
||||
"WebsiteURL" : {
|
||||
"Value" : { "Fn::Join" : ["", ["http://", { "Fn::GetAtt" : [ "WebServer", "PublicIp" ]}, "/wordpress"]] },
|
||||
"Description" : "URL for Wordpress wiki"
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user