From c4595c369ab07bb5c5cc1d73e6fc17d118bab85d Mon Sep 17 00:00:00 2001 From: Michael Wittig Date: Fri, 17 Feb 2017 14:38:47 +0100 Subject: [PATCH] added a unique template id output to make future automation easier --- ec2/ec2-auto-recovery.yaml | 3 +++ jenkins/jenkins2-ha-agents.yaml | 3 +++ jenkins/jenkins2-ha.yaml | 3 +++ security/account-password-policy.yaml | 4 ++++ security/auth-proxy-ha-github-orga.yaml | 3 +++ security/cloudtrail.yaml | 4 ++++ security/config.yaml | 4 ++++ static-website/static-website.yaml | 3 +++ vpc/vpc-2azs-legacy.yaml | 3 +++ vpc/vpc-2azs.yaml | 3 +++ vpc/vpc-3azs-legacy.yaml | 3 +++ vpc/vpc-3azs.yaml | 3 +++ vpc/vpc-4azs-legacy.yaml | 3 +++ vpc/vpc-4azs.yaml | 3 +++ vpc/vpc-endpoint-s3.yaml | 3 +++ vpc/vpc-nat-gateway.yaml | 3 +++ vpc/vpc-nat-instance.yaml | 3 +++ vpc/vpc-ssh-bastion.yaml | 3 +++ wordpress/wordpress-ha.yaml | 3 +++ 19 files changed, 60 insertions(+) diff --git a/ec2/ec2-auto-recovery.yaml b/ec2/ec2-auto-recovery.yaml index 90b961742..c6409f140 100644 --- a/ec2/ec2-auto-recovery.yaml +++ b/ec2/ec2-auto-recovery.yaml @@ -409,6 +409,9 @@ Resources: - Name: InstanceId Value: !Ref VirtualMachine Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'ec2/ec2-auto-recovery' IPAddress: Description: 'The public IP address of the EC2 instance.' Value: !Ref ElasticIP diff --git a/jenkins/jenkins2-ha-agents.yaml b/jenkins/jenkins2-ha-agents.yaml index 399317177..32897583e 100644 --- a/jenkins/jenkins2-ha-agents.yaml +++ b/jenkins/jenkins2-ha-agents.yaml @@ -1585,6 +1585,9 @@ Resources: ComparisonOperator: LessThanOrEqualToThreshold MetricName: BuildActive Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'jenkins/jenkins2-ha-agents' AdminUsername: Description: 'User name for the Jenkins admin.' Value: admin diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml index ccb61e992..1d0c7c828 100644 --- a/jenkins/jenkins2-ha.yaml +++ b/jenkins/jenkins2-ha.yaml @@ -652,6 +652,9 @@ Resources: PauseTime: PT15M WaitOnResourceSignals: true Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'jenkins/jenkins2-ha' AdminUsername: Description: 'User name for the Jenkins admin.' Value: admin diff --git a/security/account-password-policy.yaml b/security/account-password-policy.yaml index 3f63530a8..abc82f53e 100644 --- a/security/account-password-policy.yaml +++ b/security/account-password-policy.yaml @@ -159,3 +159,7 @@ Resources: Version: '1.0' Properties: ServiceToken: !GetAtt 'LambdaFunction.Arn' +Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'security/account-password-policy' diff --git a/security/auth-proxy-ha-github-orga.yaml b/security/auth-proxy-ha-github-orga.yaml index c21819132..6a8b9d890 100644 --- a/security/auth-proxy-ha-github-orga.yaml +++ b/security/auth-proxy-ha-github-orga.yaml @@ -672,6 +672,9 @@ Resources: PauseTime: PT10M WaitOnResourceSignals: true Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'security/auth-proxy-ha-github-orga' SecurityGroup: Description: 'Use this Security Group to reference incoming traffic from the auth proxy.' Value: !Ref SecurityGroup diff --git a/security/cloudtrail.yaml b/security/cloudtrail.yaml index 00eb3975e..686c56bb9 100644 --- a/security/cloudtrail.yaml +++ b/security/cloudtrail.yaml @@ -122,3 +122,7 @@ Resources: CloudWatchLogsLogGroupArn: !GetAtt 'TrailLogGroup.Arn' CloudWatchLogsRoleArn: !GetAtt 'TrailLogGroupRole.Arn' SnsTopicName: !GetAtt 'TrailTopic.TopicName' +Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'security/cloudtrail' diff --git a/security/config.yaml b/security/config.yaml index 1b76ba0d2..5256fe891 100644 --- a/security/config.yaml +++ b/security/config.yaml @@ -98,3 +98,7 @@ Resources: AllSupported: true IncludeGlobalResourceTypes: true RoleARN: !If [InternalBucket, !GetAtt 'ConfigurationRecorderRole.Arn', !GetAtt 'ExternalConfigurationRecorderRole.Arn'] +Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'security/config' diff --git a/static-website/static-website.yaml b/static-website/static-website.yaml index e1f1e53a1..b73bc813c 100644 --- a/static-website/static-website.yaml +++ b/static-website/static-website.yaml @@ -176,6 +176,9 @@ Resources: HostedZoneId: Z2FDTNDATAQYW2 DNSName: !GetAtt 'CloudFrontDistributionRedirect.DomainName' Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'static-website/static-website' URL: Description: 'URL to static website.' Value: !Sub 'https://${DomainName}' diff --git a/vpc/vpc-2azs-legacy.yaml b/vpc/vpc-2azs-legacy.yaml index f9dbff457..564571a03 100644 --- a/vpc/vpc-2azs-legacy.yaml +++ b/vpc/vpc-2azs-legacy.yaml @@ -58,6 +58,9 @@ Resources: Properties: BucketName: !Ref 'AWS::StackName' Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'vpc/vpc-2azs-legacy' AZs: Description: 'AZs' Value: 2 diff --git a/vpc/vpc-2azs.yaml b/vpc/vpc-2azs.yaml index fb8b47581..6f812e13c 100644 --- a/vpc/vpc-2azs.yaml +++ b/vpc/vpc-2azs.yaml @@ -196,6 +196,9 @@ Resources: Egress: true CidrBlock: '0.0.0.0/0' Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'vpc/vpc-2azs' AZs: Description: 'AZs' Value: 2 diff --git a/vpc/vpc-3azs-legacy.yaml b/vpc/vpc-3azs-legacy.yaml index 0982d4e78..49025365e 100644 --- a/vpc/vpc-3azs-legacy.yaml +++ b/vpc/vpc-3azs-legacy.yaml @@ -70,6 +70,9 @@ Resources: Properties: BucketName: !Ref 'AWS::StackName' Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'vpc/vpc-3azs-legacy' AZs: Description: 'AZs' Value: 3 diff --git a/vpc/vpc-3azs.yaml b/vpc/vpc-3azs.yaml index 2c5e2ea69..de3c51ba7 100644 --- a/vpc/vpc-3azs.yaml +++ b/vpc/vpc-3azs.yaml @@ -239,6 +239,9 @@ Resources: Egress: true CidrBlock: '0.0.0.0/0' Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'vpc/vpc-3azs' AZs: Description: 'AZs' Value: 3 diff --git a/vpc/vpc-4azs-legacy.yaml b/vpc/vpc-4azs-legacy.yaml index 7d56fea40..17355c20e 100644 --- a/vpc/vpc-4azs-legacy.yaml +++ b/vpc/vpc-4azs-legacy.yaml @@ -82,6 +82,9 @@ Resources: Properties: BucketName: !Ref 'AWS::StackName' Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'vpc/vpc-4azs-legacy' AZs: Description: 'AZs' Value: 4 diff --git a/vpc/vpc-4azs.yaml b/vpc/vpc-4azs.yaml index 78297d43e..ca9cd9427 100644 --- a/vpc/vpc-4azs.yaml +++ b/vpc/vpc-4azs.yaml @@ -282,6 +282,9 @@ Resources: Egress: true CidrBlock: '0.0.0.0/0' Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'vpc/vpc-4azs' AZs: Description: 'AZs' Value: 4 diff --git a/vpc/vpc-endpoint-s3.yaml b/vpc/vpc-endpoint-s3.yaml index b7144231b..2ae9f0dda 100644 --- a/vpc/vpc-endpoint-s3.yaml +++ b/vpc/vpc-endpoint-s3.yaml @@ -22,6 +22,9 @@ Resources: VpcId: 'Fn::ImportValue': !Sub '${ParentVPCStack}-VPC' Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'vpc/vpc-endpoint-s3' Endpoint: Description: 'The VPC endpoint to S3.' Value: !Ref EndpointS3 diff --git a/vpc/vpc-nat-gateway.yaml b/vpc/vpc-nat-gateway.yaml index ae2f1955e..13bb89254 100644 --- a/vpc/vpc-nat-gateway.yaml +++ b/vpc/vpc-nat-gateway.yaml @@ -44,6 +44,9 @@ Resources: DestinationCidrBlock: '0.0.0.0/0' NatGatewayId: !Ref NatGateway Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'vpc/vpc-nat-gateway' IPAddress: Description: 'The public IP address of the NAT gateway.' Value: !Ref EIP diff --git a/vpc/vpc-nat-instance.yaml b/vpc/vpc-nat-instance.yaml index c987c10af..008ef84e8 100644 --- a/vpc/vpc-nat-instance.yaml +++ b/vpc/vpc-nat-instance.yaml @@ -452,6 +452,9 @@ Resources: PauseTime: PT10M WaitOnResourceSignals: true Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'vpc/vpc-nat-instance' IPAddress: Description: 'The public IP address of the NAT instance.' Value: !Ref EIP diff --git a/vpc/vpc-ssh-bastion.yaml b/vpc/vpc-ssh-bastion.yaml index a53659cce..7ecb072bb 100644 --- a/vpc/vpc-ssh-bastion.yaml +++ b/vpc/vpc-ssh-bastion.yaml @@ -391,6 +391,9 @@ Resources: PauseTime: PT10M WaitOnResourceSignals: true Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'vpc/vpc-ssh-bastion' SecurityGroup: Description: 'Use this Security Group to reference incoming traffic from the SSH bastion host/instance.' Value: !Ref SecurityGroup diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml index 46cf3ef1a..e4069e2f4 100644 --- a/wordpress/wordpress-ha.yaml +++ b/wordpress/wordpress-ha.yaml @@ -743,6 +743,9 @@ Resources: SslSupportMethod: 'sni-only' MinimumProtocolVersion: TLSv1 Outputs: + TemplateID: + Description: 'cloudonaut.io template id' + Value: 'wordpress/wordpress-ha' CloudFrontID: Description: 'The ID of the CloudFront distribution.' Value: !Ref CloudFrontDistribution