Optionally use aws/openstack role in edx_sandbox/edx-stateless.

This adds two new variables to common_vars:

- COMMON_ENABLE_AWS_INTEGRATION
- COMMON_ENABLE_OPENSTACK_INTEGRATION

They are both set to False by default. When set to True, the
corresponding role (aws/openstack) will be automatically included in
edx_sandbox.yml and edx-stateless.yml playbooks.

CHANGELOG.md

+- Role: common_vars
+  - Added `COMMON_ENABLE_AWS_INTEGRATION` to run the `aws` role when enabled. Default: `False`
+  - Added `COMMON_ENABLE_OPENSTACK_INTEGRATION` to run the `openstack` role when enabled. Default: `False`
 - Role: credentials
   - Added `CREDENTIALS_EXTRA_APPS` to enable the inclusion of additional Django apps in the Credentials Service.
 - Role: common

playbooks/edx-stateless.yml

@@ -38,6 +38,12 @@
       celery_worker: True
     - edxapp
 
+    # AWS / OpenStack libraries & tools
+    - role: aws
+      when: COMMON_ENABLE_AWS_INTEGRATION
+    - role: openstack
+      when: COMMON_ENABLE_OPENSTACK_INTEGRATION
+
     # Discussion forums
     # https://github.com/edx/cs_comments_service
     - forum

playbooks/edx_sandbox.yml

@@ -42,6 +42,10 @@
     - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
     - { role: 'edxapp', celery_worker: True }
     - edxapp
+    - role: aws
+      when: COMMON_ENABLE_AWS_INTEGRATION
+    - role: openstack
+      when: COMMON_ENABLE_OPENSTACK_INTEGRATION
     - role: ecommerce
       when: SANDBOX_ENABLE_ECOMMERCE
     - role: ecomworker

playbooks/roles/common_vars/defaults/main.yml

@@ -14,6 +14,11 @@ COMMON_BASIC_AUTH_EXCEPTIONS:
 # Settings to use for calls to edxapp manage.py
 COMMON_EDXAPP_SETTINGS: 'aws'
 
+# Set to True to install aws/openstack role
+# when running edx_sandbox or edx-stateless playbook.
+COMMON_ENABLE_AWS_INTEGRATION: False
+COMMON_ENABLE_OPENSTACK_INTEGRATION: False
+
 # Turn on syncing logs on rotation for edx
 # application and tracking logs, must also
 # have the aws or openstack role installed
@@ -88,6 +93,7 @@ COMMON_MYSQL_MIGRATE_PASS: 'password'
 
 COMMON_MONGO_READ_ONLY_USER: 'read_only'
 COMMON_MONGO_READ_ONLY_PASS: !!null
+
 COMMON_ENABLE_DATADOG: False
 COMMON_ENABLE_NGINXTRA: False
 COMMON_ENABLE_SPLUNKFORWARDER: False