vpc changes

playbooks/bastion.yml

 - hosts: tag_group_mlapi-bastion
+  vars_files:
+    - ["{{ secure_file_dir }}/users.yml", "vars/secure_default/users.yml"]
+    - ["{{ secure_file_dir }}/bastion_users.yml"]
   roles:
+    - common
     - bastion
\ No newline at end of file

playbooks/ec2.ini

 [ec2]
 regions=all
 destination_variable=public_dns_name
-vpc_destination_variable=private_ip_address
+vpc_destination_variable=ip_address
 cache_path=/tmp
 cache_max_age=300

playbooks/roles/bastion/tasks/main.yml

@@ -7,14 +7,18 @@
   file: path=$app_base_dir owner=root group=edx mode=2775 state=directory
   file: path=$app_base_dir owner=ubuntu group=edx mode=2775 state=directory
   sudo: True
-- name: Update apt cache
-  sudo: True
-  apt: update_cache=yes
 - name: install git and its recommends
-  apt: pkg=git state=installed install_recommends=yes
+  apt: pkg=git state=installed install_recommends=yes force=yes
   sudo: True
 - name : install python and its recommends
-  apt: pkg=python state=installed install_recommends=yes
+  apt: pkg=python state=installed install_recommends=yes force=yes
+  sudo: True
+- name : install python pip and its recommends
+  apt: pkg=python-pip state=installed install_recommends=yes force=yes
   sudo: True
 - name: git checkout configuration repo into $app_base_dir
-  git: dest=$app_base_dir/configuration repo=git@github.com:edx/configuration.git
+  git: dest=$app_base_dir/configuration repo=git@github.com:edx/configuration.git version=vik/ml-api
\ No newline at end of file
+- name: install requirements in python using pip
+  pip: requirements=$app_base_dir/configuration/ansible-requirements.txt
+- name: uploads any needed secret config files
+  file: src=../../../../../edx-secret dest=/path/to/symlink owner=ubuntu group=edx state=file
\ No newline at end of file

playbooks/roles/common/tasks/main.yml

@@ -6,6 +6,9 @@
 - name: Create log directory
   sudo: True
   file: path=/mnt/logs state=directory
+- name: Fix EC2 packages in VPC
+  sudo: True
+  command: sed -i -e 's/us-west-2.ec2/us/' /etc/apt/sources.list
 - name: Update apt cache
   sudo: True
   apt: update_cache=yes