Update cloudformation-template-ipsec (#850)

* Update cloudformation-template-ipsec

- Add "CreationPolicy" to notify the user when the setup script succeeds on the virtual machine. The stack fails if the script fails.
- The timeout is 10 minutes.
- This feature is to be tested on Debian(s). I have personally tested it on Ubuntu20.

* Update README.md

- Remove the notice no longer needed. (The stack will be flagged as CREATE_COMPLETE only when the script succeeds on the VM.)

* Update README-zh.md

- 移除没用的贴士。堆栈将会自动检查脚本是否成功执行。

aws/README-zh.md

@@ -31,9 +31,7 @@
 
 <a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new" target="_blank"><img src="cloudformation-launch-stack-button.png" alt="Launch stack" height="34px"></a>
 
-要指定一个 AWS 区域，你可以使用导航栏上你的帐户信息右侧的选择器。成功创建堆栈后，单击 **Outputs** 选项卡以查看你的 VPN 登录信息。然后继续下一步：[配置 VPN 客户端](../README-zh.md#下一步)。
+要指定一个 AWS 区域，你可以使用导航栏上你的帐户信息右侧的选择器。一但堆栈的部署状态变成 **"CREATE_COMPLETE"** ，你就可以连接到服务器了。单击 **Outputs** 选项卡以查看你的 VPN 登录信息，然后继续下一步：[配置 VPN 客户端](../README-zh.md#下一步)。
-
-> **注：** 在堆栈显示 **CREATE_COMPLETE** 之后，你至少需要再等待5分钟，然后使用 VPN 客户端连接。这是为了确保 VPN 安装完成。
 
 ## 常见问题
 

aws/README.md

@@ -31,9 +31,7 @@ Click the icon below to start:
 
 <a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new" target="_blank"><img src="cloudformation-launch-stack-button.png" alt="Launch stack" height="34px"></a>
 
-You may choose an AWS region using the selector to the right of your account information on the navigation bar. After the stack is successfully created, click the **Outputs** tab to view your VPN login details. Then continue to [Next steps: Configure VPN Clients](../README.md#next-steps).
+You may choose an AWS region using the selector to the right of your account information on the navigation bar. As soon as the stack's status turns **"CREATE_COMPLETE"**, you are ready to connect to the VPN server. Click the **Outputs** tab to view your VPN login details. Then continue to [Next steps: Configure VPN Clients](../README.md#next-steps).
-
-> **Note:** You will need to wait at least 5 minutes after the stack shows **CREATE_COMPLETE**, before you can connect to the server with a VPN client. This is to allow time for the VPN setup to complete.
 
 ## FAQs
 

aws/cloudformation-template-ipsec

@@ -320,6 +320,11 @@
         },
         "VpnInstance": {
             "Type": "AWS::EC2::Instance",
+            "CreationPolicy": {
+                "ResourceSignal": {
+                    "Timeout": "PT10M"
+                }
+            },
             "Properties": {
                 "UserData": {
                     "Fn::Base64": {
@@ -343,7 +348,20 @@
                                 },
                                 "'\n",
                                 "sleep 60\n",
-                                "wget https://git.io/vpnsetup -O vpnsetup.sh && sh vpnsetup.sh\n"
+                                "wget https://git.io/vpnsetup -O vpnsetup.sh && sh vpnsetup.sh\n",
+                                "apt-get install python3-pip -y\n",
+                                "pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n",
+                                "cfn-signal ",
+                                "--stack ",
+                                {
+                                    "Ref": "AWS::StackName"
+                                },
+                                " --resource VpnInstance ",
+                                " --region ",
+                                {
+                                    "Ref": "AWS::Region"
+                                },
+                                "\n"
                             ]
                         ]
                     }