add 'owner' tag on ec2 instances (cloudformation templates)

Guillaume Coré

2017-09-22 d9abab9c025f1ac1ee7197273d4f08c588663768

add 'owner' tag on ec2 instances (cloudformation templates)

- ans-tower-lab
- bu-workshop
- ocp-demo-lab
- ocp-ha-lab
- ocp-workshop
- three-tier-app

 ansible/configs/ans-tower-lab/README.adoc

@@ -65,6 +65,7 @@
        -e "cloud_provider=${CLOUDPROVIDER}" \
        -e "aws_region=${REGION}" \
        -e "HostedZoneId=${HOSTZONEID}" \
        -e "email=name@example.com" \
      -e "install_ipa_client=false" \
      -e "repo_method=file" -e "own_repo_path=${REPO_PATH}" -e "repo_version=${REPO_VERSION}" \
      -e "software_to_deploy=none"

 ansible/configs/ans-tower-lab/files/cloud_providers/ec2_cloud_template.j2

@@ -353,6 +353,10 @@
          {
            "Key": "internaldns",
            "Value": "bastion.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ]
      }
@@ -433,6 +437,10 @@
              {
                "Key": "internaldns",
                "Value": "tower{{loop.index}}.{{chomped_zone_internal_dns}}"
              },
              {
                "Key": "owner",
                "Value": "{{ email | default('unknown')}}"
              }
            ],
            "BlockDeviceMappings": [
@@ -531,6 +539,10 @@
              {
                "Key": "internaldns",
                "Value": "frontend{{loop.index}}.{{chomped_zone_internal_dns}}"
              },
              {
                "Key": "owner",
                "Value": "{{ email | default('unknown')}}"
              }
            ],
            "BlockDeviceMappings": [
@@ -621,6 +633,10 @@
              {
                "Key": "internaldns",
                "Value": "app{{loop.index}}.{{chomped_zone_internal_dns}}"
              },
              {
                "Key": "owner",
                "Value": "{{ email | default('unknown')}}"
              }
            ],
            "BlockDeviceMappings": [
@@ -711,6 +727,10 @@
          {
            "Key": "internaldns",
            "Value": "appdb{{loop.index}}.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -813,6 +833,10 @@
          {
            "Key": "internaldns",
            "Value": "windows{{loop.index}}.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -903,6 +927,10 @@
          {
            "Key": "internaldns",
            "Value": "support{{loop.index}}.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [

 ansible/configs/bu-workshop/files/cloud_providers/ec2_cloud_template.j2

@@ -296,6 +296,10 @@
          {
            "Key": "{{ project_tag }}",
            "Value": "master"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -372,6 +376,10 @@
          {
            "Key": "{{ project_tag }}",
            "Value": "infranode"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -467,6 +475,10 @@
            "Key": "{{ project_tag }}",
            "Value": "node",
            "PropagateAtLaunch": true
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "VPCZoneIdentifier": [
@@ -517,6 +529,10 @@
          {
            "Key": "{{ project_tag }}",
            "Value": "support"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -571,6 +587,10 @@
          {
            "Key": "{{ project_tag }}",
            "Value": "bastion"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ]
      }
@@ -587,6 +607,10 @@
          {
            "Key": "Project",
            "Value": "{{ project_tag }}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ]
      }

 ansible/configs/ocp-demo-lab/README.adoc

@@ -69,6 +69,7 @@
       -e "guid=${GUID}" -e "env_type=${ENVTYPE}" -e "cloud_provider=${CLOUDPROVIDER}" \
       -e "aws_region=${REGION}"  -e "HostedZoneId=${HOSTZONEID}" -e "key_name=${KEYNAME}" \
       -e "subdomain_base_suffix=${BASESUFFIX}"  -e "install_idm=htpasswd" \
    -e "email=name@example.com" \
       -e "node_instance_count=${NODE_COUNT}" -e "infranode_instance_count=1" -e "master_instance_count=1" \
       -e "software_to_deploy=none"  -e "own_repo_path=${REPO_PATH}" -e "ipa_host_password=${IPAPASS}" \
       -e "tower_run=false"

 ansible/configs/ocp-demo-lab/files/cloud_providers/ec2_cloud_template.j2

@@ -327,6 +327,10 @@
          {
            "Key": "{{ project_tag }}",
            "Value": "bastion"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ]
      }
@@ -398,6 +402,10 @@
        {
          "Key": "{{ project_tag }}",
          "Value": "master"
        },
        {
          "Key": "owner",
          "Value": "{{ email | default('unknown')}}"
        }
      ],
      "BlockDeviceMappings": [
@@ -485,6 +493,10 @@
      {
        "Key": "{{ project_tag }}",
        "Value": "node"
      },
      {
        "Key": "owner",
        "Value": "{{ email | default('unknown')}}"
      }
    ],
    "BlockDeviceMappings": [
@@ -576,6 +588,10 @@
      {
        "Key": "{{ project_tag }}",
        "Value": "infranode"
      },
      {
        "Key": "owner",
        "Value": "{{ email | default('unknown')}}"
      }
    ],
    "BlockDeviceMappings": [
@@ -665,6 +681,10 @@
      {
        "Key": "{{ project_tag }}",
        "Value": "support"
      },
      {
        "Key": "owner",
        "Value": "{{ email | default('unknown')}}"
      }
    ],
    "BlockDeviceMappings": [
@@ -720,6 +740,10 @@
      {
        "Key": "Project",
        "Value": "{{project_tag}}"
      },
      {
        "Key": "owner",
        "Value": "{{ email | default('unknown')}}"
      }
    ]
  }

 ansible/configs/ocp-ha-lab/README.adoc

@@ -78,6 +78,7 @@
    -e "infranode_instance_type=t2.large" -e "node_instance_type=t2.large" \
    -e "support_instance_type=t2.medium" -e "node_instance_count=${NODE_COUNT}" \
    -e "ipa_host_password=${IPAPASS}" -e "install_idm=htpasswd"  \
    -e "email=name@example.com" \
    -e "repo_method=file" -e "own_repo_path=${REPO_PATH}" -e "repo_version=${REPO_VERSION}" \
    -e "software_to_deploy=openshift" -e "osrelease=3.5.5.15" -e "docker_version=1.12.6" \
    -e "ANSIBLE_REPO_PATH=${DEPLOYER_REPO_PATH}" \

 ansible/configs/ocp-ha-lab/files/cloud_providers/ec2_cloud_template.j2

@@ -330,6 +330,10 @@
          {
            "Key": "{{ project_tag }}",
            "Value": "bastion"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -412,6 +416,10 @@
          {
            "Key": "{{ project_tag }}",
            "Value": "loadbalancer"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ]
      }
@@ -489,6 +497,10 @@
            {
              "Key": "{{ project_tag }}",
              "Value": "master"
            },
            {
              "Key": "owner",
              "Value": "{{ email | default('unknown')}}"
            }
          ],
          "BlockDeviceMappings": [
@@ -576,6 +588,10 @@
          {
            "Key": "{{ project_tag }}",
            "Value": "node"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -667,6 +683,10 @@
          {
            "Key": "{{ project_tag }}",
            "Value": "infranode"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -764,6 +784,10 @@
          {
            "Key": "{{ project_tag }}",
            "Value": "support"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [

 ansible/configs/ocp-workshop/README.adoc

@@ -96,6 +96,7 @@
       -e "bastion_instance_type=t2.large" -e "master_instance_type=c4.xlarge" \
       -e "infranode_instance_type=c4.4xlarge" -e "node_instance_type=c4.4xlarge" \
       -e "nfs_instance_type=m3.large" -e "node_instance_count=5" \
       -e "email=name@example.com" \
  -e "install_idm=htpasswd" -e "software_to_deploy=openshift" \
  -e "own_repo_path=${REPO_PATH}" --skip-tags=remove_self_provisioners

@@ -130,6 +131,7 @@
    -e "support_instance_type=c4.xlarge" -e "node_instance_count=${NODE_COUNT}" \
    -e "ipa_host_password=${IPAPASS}" -e "install_idm=ldap"  \
    -e "repo_method=satellite" -e "repo_version=${REPO_VERSION}" \
    -e "email=name@example.com" \
    -e "software_to_deploy=openshift" -e "osrelease=3.5.5.15" -e "docker_version=1.12.6" \
    -e "ANSIBLE_REPO_PATH=${DEPLOYER_REPO_PATH}" 1>> $LOG_FILE 2>> $LOG_FILE

@@ -157,6 +159,7 @@
  -e "infranode_instance_type=c4.4xlarge" -e "node_instance_type=c4.4xlarge" \
  -e "nfs_instance_type=t2.large" -e "node_instance_count=${NODE_COUNT}" \
  -e "install_idm=htpasswd" -e "software_to_deploy=openshift" \
  -e "email=name@example.com" \
  -e "own_repo_path=${REPO_PATH}" -e"repo_method=rhn" -e"ANSIBLE_REPO_PATH=${DEPLOYER_REPO_PATH}" \
  -e "osrelease=3.5.5.31" -e "repo_version=${REPO_VERSION}" -e "docker_version=1.12.6" \
    --skip-tags=remove_self_provisioners,opentlc-integration
@@ -192,6 +195,7 @@
                         -e "nfs_instance_type=m3.large" \
                         -e "osrelease=${MINOR_VERSION}" \
                         -e "own_repo_path=${REPO_PATH}" \
                         -e "email=name@example.com" \
                         -e "repo_method=file" \
                         -e "subdomain_base_suffix=${BASESUFFIX}" \
                         --skip-tags=remove_self_provisioners,install_zabbix \

 ansible/configs/ocp-workshop/files/cloud_providers/ec2_cloud_template.j2

@@ -329,6 +329,10 @@
          {
            "Key": "internaldns",
            "Value": "bastion.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -419,6 +423,10 @@
              {
                "Key": "internaldns",
                "Value": "master{{loop.index}}.{{chomped_zone_internal_dns}}"
              },
              {
                "Key": "owner",
                "Value": "{{ email | default('unknown')}}"
              }
            ],
            "BlockDeviceMappings": [
@@ -527,6 +535,10 @@
          {
            "Key": "internaldns",
            "Value": "node{{loop.index}}.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -622,6 +634,10 @@
          {
            "Key": "internaldns",
            "Value": "infranode{{loop.index}}.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -723,6 +739,10 @@
          {
            "Key": "internaldns",
            "Value": "support{{loop.index}}.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -778,6 +798,10 @@
      {
        "Key": "Project",
        "Value": "{{project_tag}}"
      },
      {
        "Key": "owner",
        "Value": "{{ email | default('unknown')}}"
      }
    ]
  }

 ansible/configs/three-tier-app/README.adoc

@@ -65,6 +65,7 @@
        -e "cloud_provider=${CLOUDPROVIDER}" \
        -e "aws_region=${REGION}" \
        -e "HostedZoneId=${HOSTZONEID}" \
        -e "email=name@example.com" \
      -e "install_ipa_client=false" \
      -e "repo_method=file" -e "own_repo_path=${REPO_PATH}" -e "repo_version=${REPO_VERSION}" \
      -e "software_to_deploy=none"

 ansible/configs/three-tier-app/files/cloud_providers/ec2_cloud_template.j2

@@ -353,6 +353,10 @@
          {
            "Key": "internaldns",
            "Value": "bastion.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ]
      }
@@ -432,6 +436,10 @@
              {
                "Key": "internaldns",
                "Value": "frontend{{loop.index}}.{{chomped_zone_internal_dns}}"
              },
              {
                "Key": "owner",
                "Value": "{{ email | default('unknown')}}"
              }
            ],
            "BlockDeviceMappings": [
@@ -528,6 +536,10 @@
              {
                "Key": "internaldns",
                "Value": "app{{loop.index}}.{{chomped_zone_internal_dns}}"
              },
              {
                "Key": "owner",
                "Value": "{{ email | default('unknown')}}"
              }
            ],
            "BlockDeviceMappings": [
@@ -618,6 +630,10 @@
          {
            "Key": "internaldns",
            "Value": "appdb{{loop.index}}.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [
@@ -708,6 +724,10 @@
          {
            "Key": "internaldns",
            "Value": "support{{loop.index}}.{{chomped_zone_internal_dns}}"
          },
          {
            "Key": "owner",
            "Value": "{{ email | default('unknown')}}"
          }
        ],
        "BlockDeviceMappings": [