Formatting cleanup for lamp-infrastructure provisioners.

Author: geerlingguy

lamp-infrastructure/provisioners/aws.yml

@@ -5,12 +5,36 @@
 
   vars:
     instances:
-      - { name: a4d.lamp.varnish, ssh_key: "jeff_mba_home", group: "lamp-varnish", security_group: ["default", "a4d_lamp_http"] }
-      - { name: a4d.lamp.www.1, ssh_key: "jeff_mba_home", group: "lamp-www", security_group: ["default", "a4d_lamp_http"] }
-      - { name: a4d.lamp.www.2, ssh_key: "jeff_mba_home", group: "lamp-www", security_group: ["default", "a4d_lamp_http"] }
-      - { name: a4d.lamp.db.1, ssh_key: "jeff_mba_home", group: "lamp-db", security_group: ["default", "a4d_lamp_db"] }
-      - { name: a4d.lamp.db.2, ssh_key: "jeff_mba_home", group: "lamp-db", security_group: ["default", "a4d_lamp_db"] }
-      - { name: a4d.lamp.memcached, ssh_key: "jeff_mba_home", group: "lamp-memcached", security_group: ["default", "a4d_lamp_memcached"] }
+      - {
+        name: a4d.lamp.varnish,
+        group: "lamp-varnish",
+        security_group: ["default", "a4d_lamp_http"]
+      }
+      - {
+        name: a4d.lamp.www.1,
+        group: "lamp-www",
+        security_group: ["default", "a4d_lamp_http"]
+      }
+      - {
+        name: a4d.lamp.www.2,
+        group: "lamp-www",
+        security_group: ["default", "a4d_lamp_http"]
+      }
+      - {
+        name: a4d.lamp.db.1,
+        group: "lamp-db",
+        security_group: ["default", "a4d_lamp_db"]
+      }
+      - {
+        name: a4d.lamp.db.2,
+        group: "lamp-db",
+        security_group: ["default", "a4d_lamp_db"]
+      }
+      - {
+        name: a4d.lamp.memcached,
+        group: "lamp-memcached",
+        security_group: ["default", "a4d_lamp_memcached"]
+      }
 
     security_groups:
       - name: a4d_lamp_http
@@ -34,21 +58,21 @@
       ec2_group:
         name: "{{ item.name }}"
         description: Example EC2 security group for A4D.
-        region: us-west-2
+        region: "{{ item.region | default('us-west-2') }}" # Oregon
         state: present
         rules: "{{ item.rules }}"
         rules_egress: "{{ item.rules_egress }}"
       with_items: security_groups
 
     - name: Provision EC2 instances.
       ec2:
-        key_name: "{{ item.ssh_key | default('') }}"
+        key_name: "{{ item.ssh_key | default('jeff_mba_home') }}"
         instance_tags:
           inventory_group: "{{ item.group | default('') }}"
           inventory_host: "{{ item.name | default('') }}"
         group: "{{ item.security_group | default('') }}"
-        instance_type: "{{ item.type | default('t2.micro')}}" # Falls within free tier
-        image: "{{ item.image | default('ami-11125e21') }}" # RedHat 6.5 x64 hvm
+        instance_type: "{{ item.type | default('t2.micro')}}" # Free Tier
+        image: "{{ item.image | default('ami-11125e21') }}" # RHEL6 x64 hvm
         region: "{{ item.region | default('us-west-2') }}" # Oregon
         wait: yes
         wait_timeout: 500
@@ -65,7 +89,9 @@
         groups: "aws,{{ item.1.item.group }},{{ item.1.item.name }}"
         # You can dynamically add inventory variables per-host.
         ansible_ssh_user: ec2-user
-        mysql_replication_role: "{{ 'master' if (item.1.item.name == 'a4d.lamp.db.1') else 'slave' }}"
+        mysql_replication_role: >
+          {{ 'master' if (item.1.item.name == 'a4d.lamp.db.1')
+          else 'slave' }}
         mysql_server_id: "{{ item.0 }}"
       when: item.1.instances is defined
       with_indexed_items: created_instances.results

lamp-infrastructure/provisioners/digitalocean.yml

@@ -5,12 +5,12 @@
 
   vars:
     droplets:
-      - { name: a4d.lamp.varnish, ssh_key: "138954", group: "lamp-varnish" }
-      - { name: a4d.lamp.www.1, ssh_key: "138954", group: "lamp-www" }
-      - { name: a4d.lamp.www.2, ssh_key: "138954", group: "lamp-www" }
-      - { name: a4d.lamp.db.1, ssh_key: "138954", group: "lamp-db" }
-      - { name: a4d.lamp.db.2, ssh_key: "138954", group: "lamp-db" }
-      - { name: a4d.lamp.memcached, ssh_key: "138954", group: "lamp-memcached" }
+      - { name: a4d.lamp.varnish, group: "lamp-varnish" }
+      - { name: a4d.lamp.www.1, group: "lamp-www" }
+      - { name: a4d.lamp.www.2, group: "lamp-www" }
+      - { name: a4d.lamp.db.1, group: "lamp-db" }
+      - { name: a4d.lamp.db.2, group: "lamp-db" }
+      - { name: a4d.lamp.memcached, group: "lamp-memcached" }
 
   tasks:
     - name: Provision DigitalOcean droplets.
@@ -22,23 +22,25 @@
         size_id: "{{ item.size | default(66) }}" # 512mb
         image_id: "{{ item.image | default(6372108) }}" # CentOS 6 x64.
         region_id: "{{ item.region | default(4) }}" # NYC2
-        ssh_key_ids: "{{ item.ssh_key | default('') }}"
+        ssh_key_ids: "{{ item.ssh_key | default('138954') }}" # geerlingguy
         unique_name: yes
       register: created_droplets
       with_items: droplets
 
     - name: Add DigitalOcean hosts to their respective inventory groups.
       add_host:
         name: "{{ item.1.droplet.ip_address }}"
-        groups: "digitalocean,{{ droplets[item.0].group }},{{ item.1.droplet.name }}"
+        groups: "do,{{ droplets[item.0].group }},{{ item.1.droplet.name }}"
         # You can dynamically add inventory variables per-host.
         ansible_ssh_user: root
-        mysql_replication_role: "{{ 'master' if (item.1.droplet.name == 'a4d.lamp.db.1') else 'slave' }}"
+        mysql_replication_role: >
+          "{{ 'master' if (item.1.droplet.name == 'a4d.lamp.db.1')
+          else 'slave' }}"
         mysql_server_id: "{{ item.0 }}"
       when: item.1.droplet is defined
       with_indexed_items: created_droplets.results
 
-- hosts: digitalocean
+- hosts: do
   remote_user: root
 
   tasks: