Merge pull request #1214 from edx/feanil/alton_updates

Updates to get alton to work on the admin instance.

cloudformation_templates/edx-admin-reference-architecture.json

@@ -652,6 +652,12 @@
             "FromPort":"587",
             "ToPort":"587",
             "CidrIp":"0.0.0.0/0"
+          },
+          {
+            "IpProtocol":"tcp",
+            "FromPort":"5222",
+            "ToPort":"5222",
+            "CidrIp":"0.0.0.0/0"
           }
         ],
         "SecurityGroupEgress":[
@@ -680,6 +686,12 @@
             "FromPort":"587",
             "ToPort":"587",
             "CidrIp":"0.0.0.0/0"
+          },
+          {
+            "IpProtocol":"tcp",
+            "FromPort":"5222",
+            "ToPort":"5222",
+            "CidrIp":"0.0.0.0/0"
           }
         ]
       }

playbooks/edx-east/alton.yml

+# Configure an admin instance with jenkins and asgard.
+- name: Configure instance(s)
+  hosts: all
+  sudo: True
+  gather_facts: True
+  roles:
+    - alton

playbooks/roles/alton/defaults/main.yml

@@ -24,6 +24,10 @@ ALTON_NAME: 'Alton W. Daemon'
 ALTON_HANDLE: 'alton'
 ALTON_REDIS_URL: 'redis://fakeuser:redispassword@localhost:6379'
 ALTON_HTTPSERVER_PORT: '8081'
+ALTON_WORLD_WEATHER_KEY: !!null
+
+# Needed if you want to build AMIs from alton.
+ALTON_JENKINS_URL: !!null
 
 alton_role_name: alton
 
@@ -49,6 +53,8 @@ alton_environment:
   WILL_HANDLE: "{{ ALTON_HANDLE }}"
   WILL_REDIS_URL: "{{ ALTON_REDIS_URL }}"
   WILL_HTTPSERVER_PORT: "{{ ALTON_HTTPSERVER_PORT }}"
+  WORLD_WEATHER_ONLINE_KEY: "{{ ALTON_WORLD_WEATHER_KEY }}"
+  JENKINS_URL: "{{ ALTON_JENKINS_URL }}"
 
 #
 # OS packages

playbooks/roles/redis/defaults/main.yml

@@ -19,7 +19,7 @@ REDIS_MAX_MEMORY_POLICY: "noeviction"
 # vars are namespace with the module name.
 #
 redis_role_name: redis
-redis_ppa: "ppa:rwky/redis"
+redis_ppa: "ppa:chris-lea/redis-server"
 
 redis_user: redis
 redis_group: redis
@@ -29,6 +29,6 @@ redis_group: redis
 #
 
 redis_debian_pkgs:
-  - "redis-server=2:2.8.10-rwky1~precise"
+  - "redis-server=2:2.8.11-1chl1~precise1"
 
 redis_redhat_pkgs: []