From 3b0857648863b4ed2f665507fa89670592c001e1 Mon Sep 17 00:00:00 2001 From: song Date: Thu, 13 Nov 2014 10:29:49 +0800 Subject: [PATCH 1/2] update docker stack --- .../docker-wordpress-us-east.json | 833 ++++++++---------- 1 file changed, 362 insertions(+), 471 deletions(-) mode change 100755 => 100644 stack/docker-wordpress-us-east/docker-wordpress-us-east.json diff --git a/stack/docker-wordpress-us-east/docker-wordpress-us-east.json b/stack/docker-wordpress-us-east/docker-wordpress-us-east.json old mode 100755 new mode 100644 index 7f343fc..06eb376 --- a/stack/docker-wordpress-us-east/docker-wordpress-us-east.json +++ b/stack/docker-wordpress-us-east/docker-wordpress-us-east.json @@ -9,34 +9,29 @@ } }, "platform": "ec2-vpc", - "version": "2014-02-17", + "version": "2014-11-11", "component": { - "2F6A906D-56E3-45DA-A134-669650A1546D": { - "name": "vpc", - "type": "AWS.VPC.VPC", - "uid": "2F6A906D-56E3-45DA-A134-669650A1546D", - "resource": { - "EnableDnsSupport": true, - "InstanceTenancy": "default", - "EnableDnsHostnames": false, - "DhcpOptionsId": "", - "VpcId": "", - "CidrBlock": "10.0.0.0/16" - } - }, "5769C524-C332-4A05-ACFC-6EEF6D09F318": { "name": "DefaultACL", "type": "AWS.VPC.NetworkAcl", "uid": "5769C524-C332-4A05-ACFC-6EEF6D09F318", "resource": { "AssociationSet": [ + { + "NetworkAclAssociationId": "", + "SubnetId": "@{4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8.resource.SubnetId}" + }, + { + "NetworkAclAssociationId": "", + "SubnetId": "@{89EB8423-B032-430D-8EE8-7A851BE474E4.resource.SubnetId}" + }, { "NetworkAclAssociationId": "", "SubnetId": "@{14DD44D2-0D1F-4B72-8257-961DC8913AE0.resource.SubnetId}" }, { "NetworkAclAssociationId": "", - "SubnetId": "@{4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8.resource.SubnetId}" + "SubnetId": "@{5908B991-7952-4A08-966C-EF88C6F86336.resource.SubnetId}" } ], "Default": true, @@ -106,6 +101,50 @@ "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}" } }, + "2F6A906D-56E3-45DA-A134-669650A1546D": { + "name": "vpc", + "type": "AWS.VPC.VPC", + "uid": "2F6A906D-56E3-45DA-A134-669650A1546D", + "resource": { + "EnableDnsSupport": true, + "InstanceTenancy": "default", + "EnableDnsHostnames": false, + "DhcpOptionsId": "", + "VpcId": "", + "CidrBlock": "10.0.0.0/16" + } + }, + "C88453AD-DEBC-4648-8C8F-7054221E5CEC": { + "name": "RT-1", + "type": "AWS.VPC.RouteTable", + "uid": "C88453AD-DEBC-4648-8C8F-7054221E5CEC", + "resource": { + "PropagatingVgwSet": [], + "RouteTableId": "", + "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", + "AssociationSet": [ + { + "SubnetId": "@{5908B991-7952-4A08-966C-EF88C6F86336.resource.SubnetId}", + "RouteTableAssociationId": "", + "Main": false + }, + { + "SubnetId": "@{89EB8423-B032-430D-8EE8-7A851BE474E4.resource.SubnetId}", + "RouteTableAssociationId": "", + "Main": false + } + ], + "RouteSet": [ + { + "Origin": "CreateRouteTable", + "DestinationCidrBlock": "10.0.0.0/16", + "InstanceId": "", + "NetworkInterfaceId": "", + "GatewayId": "local" + } + ] + } + }, "FBB2EA58-7B13-4073-AC4A-7656C933E734": { "name": "RT-0", "type": "AWS.VPC.RouteTable", @@ -139,160 +178,76 @@ ] } }, - "6CB4F406-2961-484A-BA86-BE4ADA002D07": { - "uid": "6CB4F406-2961-484A-BA86-BE4ADA002D07", - "name": "us-east-1a", - "type": "AWS.EC2.AvailabilityZone", - "resource": { - "ZoneName": "us-east-1a", - "RegionName": "us-east-1" - } - }, - "14DD44D2-0D1F-4B72-8257-961DC8913AE0": { - "name": "subnet0", - "type": "AWS.VPC.Subnet", - "uid": "14DD44D2-0D1F-4B72-8257-961DC8913AE0", - "resource": { - "AvailabilityZone": "@{6CB4F406-2961-484A-BA86-BE4ADA002D07.resource.ZoneName}", - "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", - "SubnetId": "", - "CidrBlock": "10.0.0.0/24" - } - }, - "2DB9601A-CCEA-4102-A358-CEB9A9FBE82F": { - "type": "AWS.EC2.Instance", - "uid": "2DB9601A-CCEA-4102-A358-CEB9A9FBE82F", - "name": "Web2", - "index": 0, - "number": 1, - "serverGroupUid": "2DB9601A-CCEA-4102-A358-CEB9A9FBE82F", - "serverGroupName": "Web2", + "1120E47A-65B5-41A7-A196-1AA258DC4C6F": { + "type": "AWS.AutoScaling.LaunchConfiguration", + "uid": "1120E47A-65B5-41A7-A196-1AA258DC4C6F", + "name": "web-config-0", "state": [ { - "id": "state-1688A0C1-1E94-4FDF-B9D9-8B698EDD0EF3", - "module": "linux.docker.deploy", "parameter": { + "files": [ + { + "value": "", + "key": "/var/www/wordpress/wp-config.php" + } + ], "container": "httpd", "image": "visualops/httpd", - "command": [ - "/usr/sbin/apache2", - "-D", - "FOREGROUND" - ], "environment": [ { - "key": "APACHE_RUN_USER", - "value": "www-data" + "value": "www-data", + "key": "APACHE_RUN_USER" }, { - "key": "APACHE_RUN_GROUP", - "value": "www-data" + "value": "www-data", + "key": "APACHE_RUN_GROUP" }, { - "key": "APACHE_LOG_DIR", - "value": "/var/log/apache2" + "value": "/var/log/apache2", + "key": "APACHE_LOG_DIR" } ], - "files": [ - { - "key": "/var/www/wordpress/wp-config.php", - "value": "" - } + "command": [ + "/usr/sbin/apache2", + "-D", + "FOREGROUND" ], "port_bindings": [ { - "key": "80", - "value": "80" + "value": "80", + "key": "80" } ] - } + }, + "id": "state-16D5F305-B747-4CA9-8DED-24CBF6D56A3D", + "module": "linux.docker.deploy" } ], "resource": { - "UserData": { - "Base64Encoded": false, - "Data": "" - }, + "UserData": "", + "LaunchConfigurationARN": "", + "InstanceMonitoring": false, + "ImageId": "ami-acfb71c4", + "KeyName": "@{E267B0C9-1290-4B4B-8A2D-B6FD8EF1D9C5.resource.KeyName}", + "EbsOptimized": false, "BlockDeviceMapping": [ { "DeviceName": "/dev/xvda", "Ebs": { - "SnapshotId": "snap-84fa8923", + "SnapshotId": "snap-8102f93d", "VolumeSize": 8, "VolumeType": "gp2" } } ], - "Placement": { - "Tenancy": "", - "AvailabilityZone": "@{6CB4F406-2961-484A-BA86-BE4ADA002D07.resource.ZoneName}" - }, - "InstanceId": "", - "ImageId": "ami-acfb71c4", - "KeyName": "@{E267B0C9-1290-4B4B-8A2D-B6FD8EF1D9C5.resource.KeyName}", - "EbsOptimized": false, - "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", - "SubnetId": "@{14DD44D2-0D1F-4B72-8257-961DC8913AE0.resource.SubnetId}", - "Monitoring": "disabled", - "NetworkInterface": [], - "InstanceType": "t2.micro", - "DisableApiTermination": false, - "ShutdownBehavior": "terminate", - "SecurityGroup": [], - "SecurityGroupId": [] - } - }, - "20D8557F-0DBD-4596-BE8C-29A6921BC4C3": { - "index": 0, - "uid": "20D8557F-0DBD-4596-BE8C-29A6921BC4C3", - "type": "AWS.VPC.NetworkInterface", - "name": "Web2-eni0", - "serverGroupUid": "20D8557F-0DBD-4596-BE8C-29A6921BC4C3", - "serverGroupName": "eni0", - "number": 1, - "resource": { - "SourceDestCheck": true, - "Description": "", - "NetworkInterfaceId": "", - "AvailabilityZone": "@{6CB4F406-2961-484A-BA86-BE4ADA002D07.resource.ZoneName}", - "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", - "SubnetId": "@{14DD44D2-0D1F-4B72-8257-961DC8913AE0.resource.SubnetId}", - "AssociatePublicIpAddress": true, - "PrivateIpAddressSet": [ - { - "PrivateIpAddress": "10.0.0.5", - "AutoAssign": true, - "Primary": true - } - ], - "GroupSet": [ - { - "GroupName": "@{71FE4498-0402-45EE-80C2-1DFCF65786C0.resource.GroupName}", - "GroupId": "@{71FE4498-0402-45EE-80C2-1DFCF65786C0.resource.GroupId}" - }, - { - "GroupName": "@{99E71C5F-5F1A-424E-8D34-FEB886ABA98A.resource.GroupName}", - "GroupId": "@{99E71C5F-5F1A-424E-8D34-FEB886ABA98A.resource.GroupId}" - }, - { - "GroupName": "@{795D6CA7-46DE-4F79-95AC-C5D56C36CB00.resource.GroupName}", - "GroupId": "@{795D6CA7-46DE-4F79-95AC-C5D56C36CB00.resource.GroupId}" - } + "SecurityGroups": [ + "@{71FE4498-0402-45EE-80C2-1DFCF65786C0.resource.GroupId}", + "@{99E71C5F-5F1A-424E-8D34-FEB886ABA98A.resource.GroupId}", + "@{795D6CA7-46DE-4F79-95AC-C5D56C36CB00.resource.GroupId}" ], - "Attachment": { - "InstanceId": "@{2DB9601A-CCEA-4102-A358-CEB9A9FBE82F.resource.InstanceId}", - "DeviceIndex": "0", - "AttachmentId": "" - } - } - }, - "E267B0C9-1290-4B4B-8A2D-B6FD8EF1D9C5": { - "name": "DefaultKP", - "type": "AWS.EC2.KeyPair", - "uid": "E267B0C9-1290-4B4B-8A2D-B6FD8EF1D9C5", - "resource": { - "KeyFingerprint": "7c:1b:e4:95:4d:5b:cf:21:13:d4:bc:fa:ec:4f:90:a1:69:60:b7:9e", - "KeyName": "docker" + "LaunchConfigurationName": "web-config-0", + "InstanceType": "t2.micro", + "AssociatePublicIpAddress": true } }, "71FE4498-0402-45EE-80C2-1DFCF65786C0": { @@ -347,8 +302,8 @@ "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", "IpPermissions": [ { - "FromPort": "22", - "ToPort": "22", + "FromPort": "80", + "ToPort": "80", "IpRanges": "0.0.0.0/0", "IpProtocol": "tcp" } @@ -411,27 +366,6 @@ ] } }, - "795D6CA7-46DE-4F79-95AC-C5D56C36CB00": { - "name": "DefaultSG", - "type": "AWS.EC2.SecurityGroup", - "uid": "795D6CA7-46DE-4F79-95AC-C5D56C36CB00", - "resource": { - "Default": true, - "GroupId": "", - "GroupName": "DefaultSG", - "GroupDescription": "default VPC security group", - "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", - "IpPermissions": [ - { - "FromPort": "22", - "ToPort": "22", - "IpRanges": "0.0.0.0/0", - "IpProtocol": "tcp" - } - ], - "IpPermissionsEgress": [] - } - }, "EC2F1020-FA6C-4610-8614-E75D279D9A74": { "uid": "EC2F1020-FA6C-4610-8614-E75D279D9A74", "name": "us-east-1b", @@ -452,265 +386,138 @@ "CidrBlock": "10.0.1.0/24" } }, - "ECA22B1A-28E8-4711-BEC5-67406D9545BA": { - "type": "AWS.EC2.Instance", - "uid": "ECA22B1A-28E8-4711-BEC5-67406D9545BA", - "name": "DB", - "index": 0, - "number": 1, - "serverGroupUid": "ECA22B1A-28E8-4711-BEC5-67406D9545BA", - "serverGroupName": "DB", - "state": [ - { - "id": "state-0A85F57C-D8F1-46A3-B5C3-29ED1DD03D96", - "module": "linux.dir", - "parameter": { - "path": [ - "/data/mysql" - ] - } - }, - { - "id": "state-AC16C8C0-BE4A-4518-B5C1-5F771CE8E653", - "module": "linux.docker.deploy", - "parameter": { - "container": "mysql", - "image": "visualops/mysql", - "command": [ - "/bin/bash", - "/opt/run.sh" - ], - "port_bindings": [ - { - "key": "3306", - "value": "3306" - } - ], - "volumes": [ - { - "key": "/data/mysql", - "value": "/var/lib/mysql" - } - ] - } - } - ], + "6CB4F406-2961-484A-BA86-BE4ADA002D07": { + "uid": "6CB4F406-2961-484A-BA86-BE4ADA002D07", + "name": "us-east-1a", + "type": "AWS.EC2.AvailabilityZone", "resource": { - "UserData": { - "Base64Encoded": false, - "Data": "" - }, - "BlockDeviceMapping": [ - { - "DeviceName": "/dev/xvda", - "Ebs": { - "SnapshotId": "snap-84fa8923", - "VolumeSize": 8, - "VolumeType": "gp2" - } - } - ], - "Placement": { - "Tenancy": "", - "AvailabilityZone": "@{EC2F1020-FA6C-4610-8614-E75D279D9A74.resource.ZoneName}" - }, - "InstanceId": "", - "ImageId": "ami-acfb71c4", - "KeyName": "@{E267B0C9-1290-4B4B-8A2D-B6FD8EF1D9C5.resource.KeyName}", - "EbsOptimized": false, + "ZoneName": "us-east-1a", + "RegionName": "us-east-1" + } + }, + "89EB8423-B032-430D-8EE8-7A851BE474E4": { + "name": "subnet2", + "type": "AWS.VPC.Subnet", + "uid": "89EB8423-B032-430D-8EE8-7A851BE474E4", + "resource": { + "AvailabilityZone": "@{6CB4F406-2961-484A-BA86-BE4ADA002D07.resource.ZoneName}", "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", - "SubnetId": "@{4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8.resource.SubnetId}", - "Monitoring": "disabled", - "NetworkInterface": [], - "InstanceType": "t2.micro", - "DisableApiTermination": false, - "ShutdownBehavior": "terminate", - "SecurityGroup": [], - "SecurityGroupId": [] + "SubnetId": "", + "CidrBlock": "10.0.2.0/24" + } + }, + "14DD44D2-0D1F-4B72-8257-961DC8913AE0": { + "name": "subnet0", + "type": "AWS.VPC.Subnet", + "uid": "14DD44D2-0D1F-4B72-8257-961DC8913AE0", + "resource": { + "AvailabilityZone": "@{6CB4F406-2961-484A-BA86-BE4ADA002D07.resource.ZoneName}", + "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", + "SubnetId": "", + "CidrBlock": "10.0.0.0/24" } }, - "7CFE77CF-C9E3-4D53-AE27-7BAC901FBB2E": { - "index": 0, - "uid": "7CFE77CF-C9E3-4D53-AE27-7BAC901FBB2E", - "type": "AWS.VPC.NetworkInterface", - "name": "DB-eni01", - "serverGroupUid": "7CFE77CF-C9E3-4D53-AE27-7BAC901FBB2E", - "serverGroupName": "eni01", - "number": 1, + "5908B991-7952-4A08-966C-EF88C6F86336": { + "name": "subnet3", + "type": "AWS.VPC.Subnet", + "uid": "5908B991-7952-4A08-966C-EF88C6F86336", "resource": { - "SourceDestCheck": true, - "Description": "", - "NetworkInterfaceId": "", "AvailabilityZone": "@{EC2F1020-FA6C-4610-8614-E75D279D9A74.resource.ZoneName}", "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", - "SubnetId": "@{4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8.resource.SubnetId}", - "AssociatePublicIpAddress": true, - "PrivateIpAddressSet": [ - { - "PrivateIpAddress": "10.0.1.4", - "AutoAssign": true, - "Primary": true - } - ], - "GroupSet": [ - { - "GroupName": "@{795D6CA7-46DE-4F79-95AC-C5D56C36CB00.resource.GroupName}", - "GroupId": "@{795D6CA7-46DE-4F79-95AC-C5D56C36CB00.resource.GroupId}" - }, - { - "GroupName": "@{99E71C5F-5F1A-424E-8D34-FEB886ABA98A.resource.GroupName}", - "GroupId": "@{99E71C5F-5F1A-424E-8D34-FEB886ABA98A.resource.GroupId}" - }, - { - "GroupName": "@{BD41A18B-6514-4114-A598-6F2A9427B446.resource.GroupName}", - "GroupId": "@{BD41A18B-6514-4114-A598-6F2A9427B446.resource.GroupId}" - } - ], - "Attachment": { - "InstanceId": "@{ECA22B1A-28E8-4711-BEC5-67406D9545BA.resource.InstanceId}", - "DeviceIndex": "0", - "AttachmentId": "" - } + "SubnetId": "", + "CidrBlock": "10.0.3.0/24" } }, - "47BDACAB-C549-4EDC-9F77-A35AD44DC7B7": { - "name": "Internet-gateway", - "type": "AWS.VPC.InternetGateway", - "uid": "47BDACAB-C549-4EDC-9F77-A35AD44DC7B7", + "E80138B3-0901-402D-A426-BC5943D772DC": { + "name": "subnet-group0", + "type": "AWS.RDS.DBSubnetGroup", + "uid": "E80138B3-0901-402D-A426-BC5943D772DC", "resource": { - "InternetGatewayId": "", - "AttachmentSet": [ - { - "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}" - } - ] + "CreatedBy": "", + "DBSubnetGroupName": "", + "SubnetIds": [ + "@{5908B991-7952-4A08-966C-EF88C6F86336.resource.SubnetId}", + "@{89EB8423-B032-430D-8EE8-7A851BE474E4.resource.SubnetId}" + ], + "DBSubnetGroupDescription": "subnet-group0 default description" } }, - "8C80BB46-9A30-47BA-9180-1155CBF1F180": { - "type": "AWS.EC2.Instance", - "uid": "8C80BB46-9A30-47BA-9180-1155CBF1F180", - "name": "Web1", - "index": 0, - "number": 1, - "serverGroupUid": "8C80BB46-9A30-47BA-9180-1155CBF1F180", - "serverGroupName": "Web1", - "state": [ - { - "id": "state-A56CF6B9-3E07-4A7B-B5B6-27647F0739CA", - "module": "linux.docker.deploy", - "parameter": { - "container": "httpd", - "image": "visualops/httpd", - "command": [ - "/usr/sbin/apache2", - "-D", - "FOREGROUND" - ], - "environment": [ - { - "key": "APACHE_RUN_USER", - "value": "www-data" - }, - { - "key": "APACHE_RUN_GROUP", - "value": "www-data" - }, - { - "key": "APACHE_LOG_DIR", - "value": "/var/log/apache2" - } - ], - "files": [ - { - "key": "/var/www/wordpress/wp-config.php", - "value": "" - } - ], - "port_bindings": [ - { - "key": "80", - "value": "80" - } - ] - } - } - ], + "631B5D64-3E86-45FA-93CD-31ACF6EBC474": { + "name": "db0", + "type": "AWS.RDS.DBInstance", + "uid": "631B5D64-3E86-45FA-93CD-31ACF6EBC474", "resource": { - "UserData": { - "Base64Encoded": false, - "Data": "" + "CreatedBy": "", + "DBInstanceIdentifier": "", + "NewDBInstanceIdentifier": "", + "DBSnapshotIdentifier": "", + "AllocatedStorage": 5, + "AutoMinorVersionUpgrade": true, + "AllowMajorVersionUpgrade": "", + "AvailabilityZone": "", + "MultiAZ": true, + "Iops": 0, + "BackupRetentionPeriod": 1, + "CharacterSetName": "", + "DBInstanceClass": "db.t2.micro", + "DBName": "wordpress", + "Endpoint": { + "Port": 3306 }, - "BlockDeviceMapping": [ - { - "DeviceName": "/dev/xvda", - "Ebs": { - "SnapshotId": "snap-84fa8923", - "VolumeSize": 8, - "VolumeType": "gp2" - } - } - ], - "Placement": { - "Tenancy": "", - "AvailabilityZone": "@{6CB4F406-2961-484A-BA86-BE4ADA002D07.resource.ZoneName}" + "Engine": "mysql", + "EngineVersion": "5.6.21", + "LicenseModel": "general-public-license", + "MasterUsername": "root", + "MasterUserPassword": "MTIzNDU2Nzg=", + "OptionGroupMembership": { + "OptionGroupName": "default:mysql-5-6" }, - "InstanceId": "", - "ImageId": "ami-acfb71c4", - "KeyName": "@{E267B0C9-1290-4B4B-8A2D-B6FD8EF1D9C5.resource.KeyName}", - "EbsOptimized": false, - "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", - "SubnetId": "@{14DD44D2-0D1F-4B72-8257-961DC8913AE0.resource.SubnetId}", - "Monitoring": "disabled", - "NetworkInterface": [], - "InstanceType": "t2.micro", - "DisableApiTermination": false, - "ShutdownBehavior": "terminate", - "SecurityGroup": [], - "SecurityGroupId": [] + "DBParameterGroups": { + "DBParameterGroupName": "default.mysql5.6" + }, + "ApplyImmediately": false, + "PendingModifiedValues": "", + "PreferredBackupWindow": "", + "PreferredMaintenanceWindow": "", + "PubliclyAccessible": false, + "DBSubnetGroup": { + "DBSubnetGroupName": "@{E80138B3-0901-402D-A426-BC5943D772DC.resource.DBSubnetGroupName}" + }, + "VpcSecurityGroupIds": [ + "@{BD41A18B-6514-4114-A598-6F2A9427B446.resource.GroupId}" + ], + "ReadReplicaSourceDBInstanceIdentifier": "", + "SourceDBInstanceIdentifierForPoint": "", + "UseLatestRestorableTime": "", + "RestoreTime": "", + "StorageType": "standard" } }, - "9B4330AD-B4FF-4AB6-B4AC-398AB6472857": { - "index": 0, - "uid": "9B4330AD-B4FF-4AB6-B4AC-398AB6472857", - "type": "AWS.VPC.NetworkInterface", - "name": "Web1-eni02", - "serverGroupUid": "9B4330AD-B4FF-4AB6-B4AC-398AB6472857", - "serverGroupName": "eni02", - "number": 1, + "2E3F0D2F-6ECB-4AF2-B20D-2E7E125A5F52": { + "uid": "2E3F0D2F-6ECB-4AF2-B20D-2E7E125A5F52", + "name": "web-asg", + "type": "AWS.AutoScaling.Group", "resource": { - "SourceDestCheck": true, - "Description": "", - "NetworkInterfaceId": "", - "AvailabilityZone": "@{6CB4F406-2961-484A-BA86-BE4ADA002D07.resource.ZoneName}", - "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", - "SubnetId": "@{14DD44D2-0D1F-4B72-8257-961DC8913AE0.resource.SubnetId}", - "AssociatePublicIpAddress": true, - "PrivateIpAddressSet": [ - { - "PrivateIpAddress": "10.0.0.4", - "AutoAssign": true, - "Primary": true - } + "AvailabilityZones": [ + "@{6CB4F406-2961-484A-BA86-BE4ADA002D07.resource.ZoneName}", + "@{EC2F1020-FA6C-4610-8614-E75D279D9A74.resource.ZoneName}" ], - "GroupSet": [ - { - "GroupName": "@{71FE4498-0402-45EE-80C2-1DFCF65786C0.resource.GroupName}", - "GroupId": "@{71FE4498-0402-45EE-80C2-1DFCF65786C0.resource.GroupId}" - }, - { - "GroupName": "@{99E71C5F-5F1A-424E-8D34-FEB886ABA98A.resource.GroupName}", - "GroupId": "@{99E71C5F-5F1A-424E-8D34-FEB886ABA98A.resource.GroupId}" - }, - { - "GroupName": "@{795D6CA7-46DE-4F79-95AC-C5D56C36CB00.resource.GroupName}", - "GroupId": "@{795D6CA7-46DE-4F79-95AC-C5D56C36CB00.resource.GroupId}" - } + "VPCZoneIdentifier": "@{14DD44D2-0D1F-4B72-8257-961DC8913AE0.resource.SubnetId} , @{4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8.resource.SubnetId}", + "LoadBalancerNames": [ + "@{BA11E650-F4CE-4DBE-A25D-0879B6692B6F.resource.LoadBalancerName}" ], - "Attachment": { - "InstanceId": "@{8C80BB46-9A30-47BA-9180-1155CBF1F180.resource.InstanceId}", - "DeviceIndex": "0", - "AttachmentId": "" - } + "AutoScalingGroupARN": "", + "DefaultCooldown": "300", + "MinSize": "1", + "MaxSize": "2", + "HealthCheckType": "EC2", + "HealthCheckGracePeriod": "300", + "TerminationPolicies": [ + "Default" + ], + "AutoScalingGroupName": "web-asg", + "DesiredCapacity": "1", + "LaunchConfigurationName": "@{1120E47A-65B5-41A7-A196-1AA258DC4C6F.resource.LaunchConfigurationName}" } }, "BA11E650-F4CE-4DBE-A25D-0879B6692B6F": { @@ -720,16 +527,10 @@ "resource": { "AvailabilityZones": [], "Subnets": [ - "@{14DD44D2-0D1F-4B72-8257-961DC8913AE0.resource.SubnetId}" - ], - "Instances": [ - { - "InstanceId": "@{8C80BB46-9A30-47BA-9180-1155CBF1F180.resource.InstanceId}" - }, - { - "InstanceId": "@{2DB9601A-CCEA-4102-A358-CEB9A9FBE82F.resource.InstanceId}" - } + "@{14DD44D2-0D1F-4B72-8257-961DC8913AE0.resource.SubnetId}", + "@{4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8.resource.SubnetId}" ], + "Instances": [], "CrossZoneLoadBalancing": true, "ConnectionDraining": { "Enabled": true, @@ -755,7 +556,7 @@ ], "HealthCheck": { "Interval": "30", - "Target": "HTTP:80/wordpress/wp-admin/install.php", + "Target": "TCP:80", "Timeout": "5", "HealthyThreshold": "9", "UnhealthyThreshold": "4" @@ -786,129 +587,219 @@ "IdleTimeout": 60 } } + }, + "795D6CA7-46DE-4F79-95AC-C5D56C36CB00": { + "name": "DefaultSG", + "type": "AWS.EC2.SecurityGroup", + "uid": "795D6CA7-46DE-4F79-95AC-C5D56C36CB00", + "resource": { + "Default": true, + "GroupId": "", + "GroupName": "DefaultSG", + "GroupDescription": "default VPC security group", + "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}", + "IpPermissions": [ + { + "FromPort": "22", + "ToPort": "22", + "IpRanges": "0.0.0.0/0", + "IpProtocol": "tcp" + } + ], + "IpPermissionsEgress": [] + } + }, + "47BDACAB-C549-4EDC-9F77-A35AD44DC7B7": { + "name": "Internet-gateway", + "type": "AWS.VPC.InternetGateway", + "uid": "47BDACAB-C549-4EDC-9F77-A35AD44DC7B7", + "resource": { + "InternetGatewayId": "", + "AttachmentSet": [ + { + "VpcId": "@{2F6A906D-56E3-45DA-A134-669650A1546D.resource.VpcId}" + } + ] + } + }, + "E267B0C9-1290-4B4B-8A2D-B6FD8EF1D9C5": { + "name": "DefaultKP", + "type": "AWS.EC2.KeyPair", + "uid": "E267B0C9-1290-4B4B-8A2D-B6FD8EF1D9C5", + "resource": { + "KeyFingerprint": "22:2f:95:6c:0b:04:86:6d:a2:86:c7:01:de:1d:74:48:81:90:a4:cc", + "KeyName": "KeyPair2DefaultKP" + } } }, "layout": { "2F6A906D-56E3-45DA-A134-669650A1546D": { "coordinate": [ - 5, + 7, 3 ], "uid": "2F6A906D-56E3-45DA-A134-669650A1546D", "size": [ - 70, - 53 + 79, + 55 ] }, + "C88453AD-DEBC-4648-8C8F-7054221E5CEC": { + "coordinate": [ + 58, + 46 + ], + "uid": "C88453AD-DEBC-4648-8C8F-7054221E5CEC", + "groupUId": "2F6A906D-56E3-45DA-A134-669650A1546D" + }, "FBB2EA58-7B13-4073-AC4A-7656C933E734": { "coordinate": [ - 50, - 5 + 76, + 4 ], "uid": "FBB2EA58-7B13-4073-AC4A-7656C933E734", "groupUId": "2F6A906D-56E3-45DA-A134-669650A1546D" }, - "6CB4F406-2961-484A-BA86-BE4ADA002D07": { + "1120E47A-65B5-41A7-A196-1AA258DC4C6F": { "coordinate": [ - 18, - 12 + 0, + 0 ], - "uid": "6CB4F406-2961-484A-BA86-BE4ADA002D07", + "uid": "1120E47A-65B5-41A7-A196-1AA258DC4C6F", + "osType": "amazon", + "architecture": "x86_64", + "rootDeviceType": "ebs" + }, + "EC2F1020-FA6C-4610-8614-E75D279D9A74": { + "coordinate": [ + 20, + 32 + ], + "uid": "EC2F1020-FA6C-4610-8614-E75D279D9A74", "groupUId": "2F6A906D-56E3-45DA-A134-669650A1546D", "size": [ - 23, + 37, + 21 + ] + }, + "4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8": { + "coordinate": [ + 22, 34 + ], + "uid": "4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8", + "groupUId": "EC2F1020-FA6C-4610-8614-E75D279D9A74", + "size": [ + 17, + 17 ] }, - "14DD44D2-0D1F-4B72-8257-961DC8913AE0": { + "6CB4F406-2961-484A-BA86-BE4ADA002D07": { "coordinate": [ 20, - 14 + 9 ], - "uid": "14DD44D2-0D1F-4B72-8257-961DC8913AE0", - "groupUId": "6CB4F406-2961-484A-BA86-BE4ADA002D07", + "uid": "6CB4F406-2961-484A-BA86-BE4ADA002D07", + "groupUId": "2F6A906D-56E3-45DA-A134-669650A1546D", "size": [ - 19, - 30 + 37, + 21 ] }, - "2DB9601A-CCEA-4102-A358-CEB9A9FBE82F": { + "89EB8423-B032-430D-8EE8-7A851BE474E4": { "coordinate": [ - 25, - 31 + 44, + 11 ], - "uid": "2DB9601A-CCEA-4102-A358-CEB9A9FBE82F", - "groupUId": "14DD44D2-0D1F-4B72-8257-961DC8913AE0", - "osType": "amazon", - "architecture": "x86_64", - "rootDeviceType": "ebs" + "uid": "89EB8423-B032-430D-8EE8-7A851BE474E4", + "groupUId": "6CB4F406-2961-484A-BA86-BE4ADA002D07", + "size": [ + 11, + 11 + ] }, - "EC2F1020-FA6C-4610-8614-E75D279D9A74": { + "14DD44D2-0D1F-4B72-8257-961DC8913AE0": { "coordinate": [ - 48, - 30 + 22, + 11 ], - "uid": "EC2F1020-FA6C-4610-8614-E75D279D9A74", - "groupUId": "2F6A906D-56E3-45DA-A134-669650A1546D", + "uid": "14DD44D2-0D1F-4B72-8257-961DC8913AE0", + "groupUId": "6CB4F406-2961-484A-BA86-BE4ADA002D07", "size": [ - 21, - 21 + 17, + 17 ] }, - "4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8": { + "5908B991-7952-4A08-966C-EF88C6F86336": { "coordinate": [ - 50, - 32 + 44, + 34 ], - "uid": "4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8", + "uid": "5908B991-7952-4A08-966C-EF88C6F86336", "groupUId": "EC2F1020-FA6C-4610-8614-E75D279D9A74", "size": [ - 17, - 17 + 11, + 11 ] }, - "ECA22B1A-28E8-4711-BEC5-67406D9545BA": { + "E80138B3-0901-402D-A426-BC5943D772DC": { "coordinate": [ - 54, - 35 + 65, + 25 ], - "uid": "ECA22B1A-28E8-4711-BEC5-67406D9545BA", - "groupUId": "4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8", - "osType": "amazon", - "architecture": "x86_64", - "rootDeviceType": "ebs" + "uid": "E80138B3-0901-402D-A426-BC5943D772DC", + "groupUId": "2F6A906D-56E3-45DA-A134-669650A1546D", + "size": [ + 13, + 13 + ] }, - "47BDACAB-C549-4EDC-9F77-A35AD44DC7B7": { + "631B5D64-3E86-45FA-93CD-31ACF6EBC474": { "coordinate": [ - 1, - 5 + 67, + 27 ], - "uid": "47BDACAB-C549-4EDC-9F77-A35AD44DC7B7", - "groupUId": "2F6A906D-56E3-45DA-A134-669650A1546D" + "uid": "631B5D64-3E86-45FA-93CD-31ACF6EBC474", + "groupUId": "E80138B3-0901-402D-A426-BC5943D772DC" }, - "8C80BB46-9A30-47BA-9180-1155CBF1F180": { + "2E3F0D2F-6ECB-4AF2-B20D-2E7E125A5F52": { "coordinate": [ - 25, - 18 + 24, + 13 ], - "uid": "8C80BB46-9A30-47BA-9180-1155CBF1F180", - "groupUId": "14DD44D2-0D1F-4B72-8257-961DC8913AE0", - "osType": "amazon", - "architecture": "x86_64", - "rootDeviceType": "ebs" + "uid": "2E3F0D2F-6ECB-4AF2-B20D-2E7E125A5F52", + "groupUId": "14DD44D2-0D1F-4B72-8257-961DC8913AE0" }, "BA11E650-F4CE-4DBE-A25D-0879B6692B6F": { "coordinate": [ - 6, - 21 + 8, + 27 ], "uid": "BA11E650-F4CE-4DBE-A25D-0879B6692B6F", "groupUId": "2F6A906D-56E3-45DA-A134-669650A1546D" }, + "47BDACAB-C549-4EDC-9F77-A35AD44DC7B7": { + "coordinate": [ + 3, + 4 + ], + "uid": "47BDACAB-C549-4EDC-9F77-A35AD44DC7B7", + "groupUId": "2F6A906D-56E3-45DA-A134-669650A1546D" + }, + "B7E9209E-E61A-4054-90F7-E1D40DFA7B51": { + "coordinate": [ + 24, + 36 + ], + "uid": "B7E9209E-E61A-4054-90F7-E1D40DFA7B51", + "groupUId": "4197AA73-3DD8-4F35-A1D0-2EDFC75DD4C8", + "type": "ExpandedAsg", + "originalId": "2E3F0D2F-6ECB-4AF2-B20D-2E7E125A5F52" + }, "size": [ 240, 240 ] }, - "signature": "7d917fd63067c8c72648dbb31e533d7f" + "signature": "1960a2a7a86c5a962dcbef9a974cd348" } From 55257873584d39c5d52bb3ba8f4754e093babf2b Mon Sep 17 00:00:00 2001 From: song Date: Thu, 13 Nov 2014 10:34:09 +0800 Subject: [PATCH 2/2] update-docker-stack-preview --- stack/docker-wordpress-us-east/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/docker-wordpress-us-east/README.md b/stack/docker-wordpress-us-east/README.md index 4da5c16..50a02d9 100755 --- a/stack/docker-wordpress-us-east/README.md +++ b/stack/docker-wordpress-us-east/README.md @@ -4,4 +4,4 @@ WordPress is a free and open source blogging tool and a content management syste ## Stack This stack is a template using the latest WordPress release. It is built with Docker module. -![](https://trello-attachments.s3.amazonaws.com/536b4d9e4a9d69b21b5c2ac1/805x644/f02d34a500c00a40e5df20d4d305a3c1/docker-wordpress-us-east.png) +![](https://trello-attachments.s3.amazonaws.com/536b4d9e4a9d69b21b5c2ac1/895x664/7fb696013b19a8d8cffb273a4cb0f952/docker-wordpress-us-east.png)