multinode対応

[pei0804]

パッチファイル作るマン

[shomah4a]

diff --git a/kakeru/scenarios/hakaru-test-multinode-2.xml.template b/kakeru/scenarios/hakaru-test-multinode-2.xml.template
index d769d91..b392370 100644
--- a/kakeru/scenarios/hakaru-test-multinode-2.xml.template
+++ b/kakeru/scenarios/hakaru-test-multinode-2.xml.template
@@ -14,11 +14,6 @@
       <users arrivalrate="10" unit="second"></users>
     </arrivalphase>
 
-    <!-- 3分間1秒に200ユーザーずつ作る -->
-    <arrivalphase phase="2" duration="3" unit="minute">
-      <users arrivalrate="200" unit="second"></users>
-    </arrivalphase>
-
     <!-- 3分間1秒に2000ユーザーずつ作る -->
     <arrivalphase phase="3" duration="3" unit="minute">
       <users arrivalrate="2000" unit="second"></users>
@@ -35,19 +30,19 @@
   <sessions>
     <session name="open" probability="90" type="ts_http">
       <request>
-        <http url="{{TARGET_PATH}}?name=open&amp;value=0" method="GET" version="1.1" >
+        <http url="/hakaru?name=open&amp;value=0" method="GET" version="1.1" >
         </http>
       </request>
     </session>
     <session name="purchase120" probability="9" type="ts_http">
       <request>
-        <http url="{{TARGET_PATH}}?name=purchase&amp;value=120" method="GET" version="1.1" >
+        <http url="/hakaru?name=purchase&amp;value=120" method="GET" version="1.1" >
         </http>
       </request>
     </session>
     <session name="purchase960" probability="1" type="ts_http">
       <request>
-        <http url="{{TARGET_PATH}}?name=purchase&amp;value=960" method="GET" version="1.1" >
+        <http url="/hakaru?name=purchase&amp;value=960" method="GET" version="1.1" >
         </http>
       </request>
     </session>
diff --git a/kakeru/scenarios/hakaru-test-multinode-3.xml.template b/kakeru/scenarios/hakaru-test-multinode-3.xml.template
index 154e856..93cc748 100644
--- a/kakeru/scenarios/hakaru-test-multinode-3.xml.template
+++ b/kakeru/scenarios/hakaru-test-multinode-3.xml.template
@@ -14,16 +14,6 @@
       <users arrivalrate="10" unit="second"></users>
     </arrivalphase>
 
-    <!-- 3分間1秒に200ユーザーずつ作る -->
-    <arrivalphase phase="2" duration="3" unit="minute">
-      <users arrivalrate="200" unit="second"></users>
-    </arrivalphase>
-
-    <!-- 3分間1秒に2000ユーザーずつ作る -->
-    <arrivalphase phase="3" duration="3" unit="minute">
-      <users arrivalrate="2000" unit="second"></users>
-    </arrivalphase>

[pei0804]

diff --git a/global.hcl b/global.hcl
index 68495cb..8620992 100644
--- a/global.hcl
+++ b/global.hcl
@@ -20,6 +20,7 @@ CIDR_OFFICE_VG_WORK_PERSONAL = "150.249.231.2/32"
 CIDR_OFFICE_VG_TEST          = "150.249.231.3/32"
 CIDR_OFFICE_VG_EMERGENCY     = "150.249.231.15/32"
 CIDR_OFFICE_VG_GUEST         = "164.70.200.59/32" // TODO: 変わり得るので当日確認すること
+CIDR_KAKERU                  = "10.2.0.0/16"

 // 以下はMakefileから注入される
 // AWS_PRIFILE                 = ""
diff --git a/kakeru/_variables.tf b/kakeru/_variables.tf
index 6b52770..a37b4ae 100644
--- a/kakeru/_variables.tf
+++ b/kakeru/_variables.tf
@@ -16,6 +16,7 @@ variable CIDR_OFFICE_VG_WORK_PERSONAL {}
 variable CIDR_OFFICE_VG_TEST {}
 variable CIDR_OFFICE_VG_EMERGENCY {}
 variable CIDR_OFFICE_VG_GUEST {}
+variable CIDR_KAKERU {}

 locals {
   vpc_cidr_block = "10.2.0.0/16"
diff --git a/kakeru/app_kakeru.tf b/kakeru/app_kakeru.tf
index c2caa6a..60052a7 100644
--- a/kakeru/app_kakeru.tf
+++ b/kakeru/app_kakeru.tf
@@ -25,6 +25,15 @@ resource "aws_security_group_rule" "kakeru_ingress_ssh" {
   cidr_blocks       = local.office_cidr_blocks
 }

+resource "aws_security_group_rule" "kakeru_ingress_kakeru_ssh" {
+  security_group_id = aws_security_group.kakeru.id
+  type              = "ingress"
+  protocol          = "tcp"
+  from_port         = 0
+  to_port           = 65535
+  cidr_blocks       = [var.CIDR_KAKERU]
+}
+
 resource "aws_security_group_rule" "kakeru_egress_all" {
   security_group_id = aws_security_group.kakeru.id
   type              = "egress"
diff --git a/kakeru/iam.tf b/kakeru/iam.tf
index 8d5e79c..f124c31 100644
--- a/kakeru/iam.tf
+++ b/kakeru/iam.tf
@@ -65,11 +65,16 @@ resource "aws_iam_role_policy_attachment" "hakrau_ssm_manager" {
   policy_arn = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
 }

-resource "aws_iam_role_policy_attachment" "hakrau_auto_scalling_readonly_access" {
+resource "aws_iam_role_policy_attachment" "kakeru_auto_scalling_readonly_access" {
   role       = aws_iam_role.kakeru.name
   policy_arn = "arn:aws:iam::aws:policy/AutoScalingReadOnlyAccess"
 }

+resource "aws_iam_role_policy_attachment" "kakeru_ec2_full_access" {
+  role       = aws_iam_role.kakeru.name
+  policy_arn = "arn:aws:iam::aws:policy/AmazonEC2FullAccess"
+}
+
 resource "aws_iam_instance_profile" "kakeru" {
   name = "kakeru"
   path = "/kakeru/"

[pei0804]

#27