Remove Old Paramters

Signed-off-by: Sean Smith <[email protected]>

Author: Sean Smith

cli/cfncluster/cfnconfig.py

@@ -228,8 +228,7 @@ def __init__(self, args):
                                       placement=('Placement',None), placement_group=('PlacementGroup','EC2PlacementGroup'),
                                       encrypted_ephemeral=('EncryptedEphemeral',None),pre_install_args=('PreInstallArgs',None),
                                       post_install_args=('PostInstallArgs',None), s3_read_resource=('S3ReadResource',None),
-                                      s3_read_write_resource=('S3ReadWriteResource',None),cwl_region=('CWLRegion',None),
-                                      cwl_log_group=('CWLLogGroup',None),shared_dir=('SharedDir',None),tenancy=('Tenancy',None),
+                                      s3_read_write_resource=('S3ReadWriteResource',None),shared_dir=('SharedDir',None),tenancy=('Tenancy',None),
                                       ephemeral_kms_key_id=('EphemeralKMSKeyId',None), cluster_ready=('ClusterReadyScript','URL'),
                                       master_root_volume_size=('MasterRootVolumeSize',None),compute_root_volume_size=('ComputeRootVolumeSize',None),
                                       base_os=('BaseOS',None),ec2_iam_role=('EC2IAMRoleName','EC2IAMRoleName'),extra_json=('ExtraJson',None),

cli/cfncluster/examples/config

@@ -103,12 +103,6 @@ key_name = mykey
 #base_os = alinux
 # CloudWatch Logs region
 # (defaults to NONE in the default template)
-#cwl_region = NONE
-# CloudWatch Logs Log Group name
-# (defaults to NONE in the default template)
-#cwl_log_group = NONE
-# Existing EC2 IAM role to be assosiated with the EC2 instances
-# (defaults to NONE in the default template)
 #ec2_iam_role = NONE
 # Extra Json to be merged with the dna.json used by Chef
 # (defaults to {} in the default template)

cloudformation/cfncluster.cfn.json

@@ -71,8 +71,6 @@
             "EncryptedEphemeral",
             "EphemeralDir",
             "SharedDir",
-            "CWLRegion",
-            "CWLLogGroup",
             "CustomChefRunList",
             "CustomChefCookbook",
             "ExtraJson",
@@ -193,12 +191,6 @@
         "S3ReadWriteResource": {
           "default": "s3_read_write_resource"
         },
-        "CWLRegion": {
-          "default": "cwl_region"
-        },
-        "CWLLogGroup": {
-          "default": "cwl_log_group"
-        },
         "ProxyServer": {
           "default": "proxy_server"
         },
@@ -268,9 +260,6 @@
         "ScaleDownIdleTime": {
           "default": "scaledown_idletime"
         },
-        "ScalingThreshold2": {
-          "default": "scaling_threshold2"
-        },
         "ComputeWaitConditionCount": {
           "default": "WAIT COUNT"
         },
@@ -926,6 +915,7 @@
       "Default": "/shared"
     },
     "CLITemplate": {
+      "Description": "cluster_template section used in the config.",
       "Type": "String",
       "Default": "default"
     },
@@ -935,16 +925,6 @@
       "Default": "NONE",
       "AllowedPattern": "(NONE|^sg-[0-9a-z]{8}$|^sg-[0-9a-z]{17}$)"
     },
-    "CWLRegion": {
-      "Description": "CloudWatch Logs region",
-      "Type": "String",
-      "Default": "NONE"
-    },
-    "CWLLogGroup": {
-      "Description": "CloudWatch Logs LogGroup",
-      "Type": "String",
-      "Default": "NONE"
-    },
     "CustomChefRunList": {
       "Description": "Custom run list, which will override the default",
       "Type": "String",
@@ -1422,34 +1402,6 @@
         }
       ]
     },
-    "CloudWatchLogs": {
-      "Fn::And": [
-        {
-          "Fn::Not": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "CWLRegion"
-                },
-                "NONE"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Not": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "CWLLogGroup"
-                },
-                "NONE"
-              ]
-            }
-          ]
-        }
-      ]
-    },
     "AddAdditionalSG": {
       "Fn::Not": [
         {
@@ -2075,27 +2027,6 @@
               "Resource": [
                 "*"
               ]
-            },
-            {
-              "Sid": "CloudWatchLogs",
-              "Action": [
-                "logs:*"
-              ],
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      "arn:",
-                      {
-                        "Ref": "AWS::Partition"
-                      },
-                      ":logs:*:*:*"
-                    ]
-                  ]
-                }
-              ]
             }
           ]
         },

docs/source/iam.rst

@@ -116,16 +116,6 @@ CfnClusterInstancePolicy
               ],
               "Sid": "SQSList",
               "Effect": "Allow"
-          },
-          {
-              "Resource": [
-                  "arn:aws:logs:*:*:*"
-              ],
-              "Action": [
-                  "logs:*"
-              ],
-              "Sid": "CloudWatchLogs",
-              "Effect": "Allow"
           }
       ]
   }