Merge pull request #4160 from edx/feanil/jenkins_workers_mongo_update

Feanil/jenkins workers mongo update

playbooks/edx-east/jenkins_worker.yml

@@ -24,7 +24,7 @@
     - mysql
     - edxlocal
     - memcache
-    - mongo
+    - mongo_3_2
     - browsers
     - browsermob-proxy
     - jenkins_worker

playbooks/roles/jenkins_worker/defaults/main.yml

@@ -15,3 +15,5 @@ jenkins_debian_pkgs:
 
 # packer direct download URL
 packer_url: "https://releases.hashicorp.com/packer/0.8.6/packer_0.8.6_linux_amd64.zip"
+
+jenkins_worker_key_url: null

playbooks/roles/jenkins_worker/tasks/system.yml

@@ -16,8 +16,12 @@
     owner={{ jenkins_user }} group={{ jenkins_group }}
   ignore_errors: yes
 
-- name: Copy ssh keys for jenkins
-  command: cp /home/ubuntu/.ssh/authorized_keys /home/{{ jenkins_user }}/.ssh/authorized_keys
+- name: Get the authorized key that should be used for this machine.
+  authorized_key:
+    user: "{{ jenkins_user }}"
+    state: present
+    key: "{{ jenkins_worker_key_url }}"
+  when: jenkins_worker_key_url
   ignore_errors: yes
 
 - name: Set key permissions

playbooks/roles/mongo_3_2/defaults/main.yml

@@ -26,6 +26,9 @@ mongodb_debian_pkgs:
   - "mongodb-org-tools={{ mongo_version }}"
 
 
+
+mongo_configure_replica_set: true
+
 # Vars Meant to be overridden
 MONGO_ADMIN_USER: 'admin'
 MONGO_ADMIN_PASSWORD: 'password'

playbooks/roles/mongo_3_2/tasks/main.yml

@@ -280,6 +280,7 @@
     rs_config: "{{ MONGO_RS_CONFIG }}"
   run_once: true
   register: replset_status
+  when: mongo_configure_replica_set
   tags:
     - "manage"
     - "manage:db"
@@ -297,6 +298,7 @@
       password: "{{ MONGO_ADMIN_PASSWORD }}"
   register: status
   until: status.status is defined and 'PRIMARY' in status.status.members|map(attribute='stateStr')|list
+  when: mongo_configure_replica_set
   retries: 5
   delay: 2
   run_once: true
@@ -318,6 +320,7 @@
     replica_set: "{{ MONGO_REPL_SET }}"
   with_items: "{{ MONGO_USERS }}"
   run_once: true
+  when: mongo_configure_replica_set
   tags:
     - "manage"
     - "manage:db"

util/packer/jenkins_worker.json

@@ -9,7 +9,8 @@
     "test_platform_version": "{{env `TEST_PLATFORM_VERSION`}}",
     "security_group": "{{env `AWS_SECURITY_GROUP`}}",
     "delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}",
-    "remote_branch": "{{env `REMOTE_BRANCH`}}"
+    "remote_branch": "{{env `REMOTE_BRANCH`}}",
+    "jenkins_worker_key_url": "{{env `JENKINS_WORKER_KEY_URL`}}"
   },
   "builders": [{
     "type": "amazon-ebs",
@@ -25,7 +26,13 @@
     "security_group_id": "{{user `security_group`}}",
     "tags": {
       "delete_or_keep": "{{user `delete_or_keep`}}"
-    }
+    },
+    "launch_block_device_mappings": [{
+      "delete_on_termination": true,
+      "device_name": "/dev/sda1",
+      "volume_size": "40",
+      "volume_type": "gp2"
+    }]
   }],
   "provisioners": [{
     "type": "shell",
@@ -52,7 +59,7 @@
     "command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook",
     "inventory_groups": "jenkins_worker",
     "extra_arguments": [
-      "-e \"jenkins_edx_platform_version={{user `test_platform_version`}} NEWRELIC_LICENSE_KEY={{user `new_relic_key`}}\"",
+      "-e \"jenkins_edx_platform_version={{user `test_platform_version`}} NEWRELIC_LICENSE_KEY={{user `new_relic_key`}} initialize_replica_set=false mongo_configure_replica_set=false jenkins_worker_key_url='{{user `jenkins_worker_key_url`}}'\"",
       "-vvv"
       ]
   }, {