finish fixing common

diff --git a/ansible.cfg b/ansible.cfg
index c6ee886c3e0a371a8d3c3625165208608a52e4c4..de5f2b3f67680b5792d72ff36ec71e7255dfc01f 100644 (file)
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -3,4 +3,4 @@ retry_files_enabled = False
 host_key_checking = False
 inventory = inventory
 remote_user = ec2-user
-private_key_file = keys/awskey.pem
+private_key_file = keys/management.pem

diff --git a/management.yml b/management.yml
index b308c43d6bddb39c939fe43f1a31774ba6962223..912a6738bdeb6eb371ae6400ff07fd2685d29b3c 100644 (file)
--- a/management.yml
+++ b/management.yml
@@ -1,11 +1,6 @@
 ---
-- hosts: localhost
-  connection: local
-  roles:
-  - aws-infrastructure
-
 - hosts: management
   become: true
   roles:
   - common
-  - management
+#  - management

diff --git a/roles/aws-infrastructure/tasks/main.yml b/roles/aws-infrastructure/tasks/main.yml
index 83085db12097b4cc945dff3ab20aca5476385265..8aa65bf0601db1c59d00626734cca7418583e64b 100644 (file)
--- a/roles/aws-infrastructure/tasks/main.yml
+++ b/roles/aws-infrastructure/tasks/main.yml
@@ -199,7 +199,7 @@
     launch_config_name: "{{ mgmt_lc.name }}"
     notification_topic: "{{ management_topic.sns_arn }}"
     notification_types:
-      - autoscaling:EC2_INSTANCE_LAUNCH
+    - autoscaling:EC2_INSTANCE_LAUNCH
     load_balancers:
     - management-int-elb
     tags:

diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 1cbf04470d9807b6e5eec5be32c12b3018455672..12c6ff1637fda0e0082a4a2d514c512c70923675 100644 (file)
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -1,5 +1,10 @@
 ---
+- name: bootstrap /data
+  stat:
+    path: /data
+  register: datadir
 - include: volumes.yml
+  when: not datadir.stat.exists
 
 - name: Create local asset directory
   when: ASSET_PATH is defined
@@ -10,19 +15,26 @@
     owner: root
     group: root
 
-- name: PIP prerequisites
+- name: Uninstall outdated python packages
   with_items:
+  - aws-cli
+  - python27-botocore
+  - python27-boto
+  yum:
+    package: "{{ item }}"
+    state: absent
+
+- name: Install new python packages
+  with_items:
+  - awscli
   - boto
   - boto3
-  - httplib2
-  - requests
   pip:
     name: "{{ item }}"
-    state: latest
+    state: present
 
 - name: Common packages
   with_items:
-  - aws-cli
   - cowsay
   - figlet
   - ipsec-tools
@@ -67,6 +79,7 @@
     state: list
     region: "{{ ansible_ec2_placement_region }}"
     resource: "{{ ansible_ec2_instance_id }}"
+  register: my_tags
 
 - name: Name instance from ID and ASG module
   when: my_tags['tags']['aws:autoscaling:groupName'] is defined