Removed all references to the Programs Service

ECOM-7207

CHANGELOG.md

+- Role: programs
+  - This role has been removed as this service is no longer supported. The role is still available on the [Ficus branch](https://github.com/edx/configuration/releases/tag/open-release%2Fficus.1).
 - Role: xqueue
   - Changed `XQUEUE_RABBITMQ_TLS` default from `true` to `false`.
-
 - Role: credentials
   - Added `CREDENTIALS_EXTRA_APPS` to enable the inclusion of additional Django apps in the Credentials Service.
 - Role: common

docker/build/docker-tools/Dockerfile

@@ -10,7 +10,6 @@
 FROM edxops/xenial-common:latest
 MAINTAINER edxops
 
-ENV PROGRAMS_VERSION=master
 ENV REPO_OWNER=edx
 
 ADD . /edx/app/edx_ansible/edx_ansible

docker/build/programs/Dockerfile

-# To build this Dockerfile:
-#
-# From the root of configuration:
-#
-# docker build -f docker/build/programs/Dockerfile .
-#
-# This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
-# with the currently checked-out configuration repo.
-
-FROM edxops/xenial-common:latest
-MAINTAINER edxops
-
-ENV PROGRAMS_VERSION=master
-ENV REPO_OWNER=edx
-
-ADD . /edx/app/edx_ansible/edx_ansible
-
-WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
-
-COPY docker/build/programs/ansible_overrides.yml /
-RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook programs.yml \
-    -c local -i '127.0.0.1,' \
-    -t 'install,assets' \
-    --extra-vars="@/ansible_overrides.yml" \
-    --extra-vars="PROGRAMS_VERSION=$PROGRAMS_VERSION" \
-    --extra-vars="COMMON_GIT_PATH=$REPO_OWNER"
-
-USER root 
-CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"]

docker/build/programs/ansible_overrides.yml

----
-DOCKER_TLD: "edx"
-# The prod settings assume an rsyslogd
-# In addition, on systemd systems, and newer rsyslogd
-# there may be issues with /dev/log existing
-# http://www.projectatomic.io/blog/2014/09/running-syslog-within-a-docker-container/
-PROGRAMS_DJANGO_SETTINGS_MODULE: programs.settings.devstack
-PROGRAMS_DATABASES:
-  # rw user
-  default:
-    ENGINE: 'django.db.backends.mysql'
-    NAME: '{{ PROGRAMS_DEFAULT_DB_NAME }}'
-    USER: 'programs001'
-    PASSWORD: 'password'
-    HOST: 'db.{{ DOCKER_TLD  }}'
-    PORT: '3306'
-    ATOMIC_REQUESTS: true
-    CONN_MAX_AGE: 60

docker/plays/programs.yml

-- name: Deploy Programs
-  hosts: all
-  sudo: True
-  gather_facts: True
-  roles:
-    - nginx
-    - docker
-    - role: programs
-      nginx_default_sites:
-        - programs

playbooks/edx-east/edx_continuous_integration.yml

@@ -15,7 +15,6 @@
       - xserver
       - analytics_api
       - ecommerce
-      - programs
       - credentials
       nginx_default_sites:
       - lms
@@ -38,7 +37,6 @@
     - edx_ansible
     - analytics_api
     - ecommerce
-    - programs
     - credentials
     - oauth_client_setup
     - role: datadog

playbooks/edx-east/oauth_client_setup.yml

@@ -7,7 +7,6 @@
     - "roles/edxapp/defaults/main.yml"
     - "roles/insights/defaults/main.yml"
     - "roles/ecommerce/defaults/main.yml"
-    - "roles/programs/defaults/main.yml"
     - "roles/credentials/defaults/main.yml"
     - "roles/discovery/defaults/main.yml"
   roles:

playbooks/edx-east/programs.yml

-- name: Deploy edX Programs Service
-  hosts: all
-  become: True
-  gather_facts: True
-  vars:
-    ENABLE_DATADOG: False
-    ENABLE_SPLUNKFORWARDER: False
-    ENABLE_NEWRELIC: False
-    CLUSTER_NAME: 'programs'
-  roles:
-    - aws
-    - role: nginx
-      nginx_sites:
-        - programs
-      nginx_default_sites:
-        - programs
-    - programs
-    - role: datadog
-      when: COMMON_ENABLE_DATADOG
-    - role: splunkforwarder
-      when: COMMON_ENABLE_SPLUNKFORWARDER
-    - role: newrelic
-      when: COMMON_ENABLE_NEWRELIC

playbooks/edx_sandbox.yml

@@ -57,7 +57,6 @@
     - role: ecomworker
       ECOMMERCE_WORKER_BROKER_HOST: 127.0.0.1
       when: SANDBOX_ENABLE_ECOMMERCE
-    - programs
     - analytics_api
     - insights
     # not ready yet: - edx_notes_api

playbooks/roles/credentials/defaults/main.yml

@@ -63,14 +63,8 @@ CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
 
 CREDENTIALS_PLATFORM_NAME: 'Your Platform Name Here'
 
-# credentials service user in programs service and lms
 CREDENTIALS_SERVICE_USER: 'credentials_service_user'
 
-# Absolute URL used to get programs from the programs service.
-CREDENTIALS_PROGRAMS_API_URL: 'https://127.0.0.1:8004/api/v1/'
-CREDENTIALS_PROGRAMS_API_JWT_AUDIENCE: 'SET-ME-TO-THE-SAME-AS-PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY'
-CREDENTIALS_PROGRAMS_API_JWT_SECRET_KEY: 'SET-ME-TO-THE-SAME-AS-PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET'
-
 # Absolute URL used to get organization data from the organizations api in LMS
 CREDENTIALS_ORGANIZATIONS_API_URL: 'https://127.0.0.1:8000/api/organizations/v0/'
 CREDENTIALS_ORGANIZATIONS_API_AUDIENCE: '{{ EDXAPP_JWT_AUDIENCE | default("lms-key") }}'
@@ -193,14 +187,8 @@ CREDENTIALS_SERVICE_CONFIG:
   # Set credentials files storage backend
   FILE_STORAGE_BACKEND: '{{ CREDENTIALS_FILE_STORAGE_BACKEND }}'
 
-  # credentials service user in programs service and lms
   CREDENTIALS_SERVICE_USER: '{{ CREDENTIALS_SERVICE_USER }}'
 
-  # programs api configuration
-  PROGRAMS_API_URL: '{{ CREDENTIALS_PROGRAMS_API_URL }}'
-  PROGRAMS_JWT_AUDIENCE: '{{ CREDENTIALS_PROGRAMS_API_JWT_AUDIENCE }}'
-  PROGRAMS_JWT_SECRET_KEY: '{{ CREDENTIALS_PROGRAMS_API_JWT_SECRET_KEY }}'
-
   # organizations api configuration
   ORGANIZATIONS_API_URL: '{{ CREDENTIALS_ORGANIZATIONS_API_URL }}'
   ORGANIZATIONS_AUDIENCE: '{{ CREDENTIALS_ORGANIZATIONS_API_AUDIENCE }}'

playbooks/roles/discovery/defaults/main.yml

@@ -89,7 +89,6 @@ DISCOVERY_COURSES_API_URL: '{{ DISCOVERY_LMS_ROOT_URL }}/api/courses/v1/'
 DISCOVERY_ORGANIZATIONS_API_URL: '{{ DISCOVERY_LMS_ROOT_URL }}/api/organizations/v0/'
 DISCOVERY_MARKETING_API_URL: 'https://example.org/api/catalog/v2/'
 DISCOVERY_MARKETING_URL_ROOT: 'https://example.org/'
-DISCOVERY_PROGRAMS_API_URL: 'https://replace-me/api/v1/'
 
 DISCOVERY_DATA_DIR: '{{ COMMON_DATA_DIR }}/{{ discovery_service_name }}'
 DISCOVERY_MEDIA_ROOT: '{{ DISCOVERY_DATA_DIR }}/media'
@@ -150,7 +149,6 @@ DISCOVERY_SERVICE_CONFIG:
   ORGANIZATIONS_API_URL: '{{ DISCOVERY_ORGANIZATIONS_API_URL }}'
   MARKETING_API_URL: '{{ DISCOVERY_MARKETING_API_URL }}'
   MARKETING_URL_ROOT: '{{ DISCOVERY_MARKETING_URL_ROOT }}'
-  PROGRAMS_API_URL: '{{ DISCOVERY_PROGRAMS_API_URL }}'
 
   EDX_DRF_EXTENSIONS: '{{ DISCOVERY_EDX_DRF_EXTENSIONS }}'
 

playbooks/roles/edx_ansible/templates/update.j2

@@ -13,7 +13,7 @@ IFS=","
             -h        this
 
     <repo> - must be one of edx-platform, edx-workers, xqueue, cs_comments_service, credentials, xserver, configuration,
-    read-only-certificate-code, edx-analytics-data-api, edx-ora2, insights, ecommerce, programs, course_discovery,
+    read-only-certificate-code, edx-analytics-data-api, edx-ora2, insights, ecommerce, course_discovery,
     notifier
     <version> - can be a commit or tag
 
@@ -59,7 +59,6 @@ repos_to_cmd["edx-analytics-data-api"]="$edx_ansible_cmd analyticsapi.yml -e 'AN
 repos_to_cmd["edx-ora2"]="$edx_ansible_cmd ora2.yml -e 'ora2_version=$2'"
 repos_to_cmd["insights"]="$edx_ansible_cmd insights.yml -e 'INSIGHTS_VERSION=$2'"
 repos_to_cmd["ecommerce"]="$edx_ansible_cmd ecommerce.yml -e 'ECOMMERCE_VERSION=$2'"
-repos_to_cmd["programs"]="$edx_ansible_cmd programs.yml -e 'PROGRAMS_VERSION=$2'"
 repos_to_cmd["discovery"]="$edx_ansible_cmd discovery.yml -e 'DISCOVERY_VERSION=$2'"
 repos_to_cmd["notifier"]="$edx_ansible_cmd notifier.yml -e 'NOTIFIER_VERSION=$2'"
 

playbooks/roles/edxlocal/defaults/main.yml

@@ -10,7 +10,6 @@ edxlocal_databases:
   - "{{ EDXAPP_MYSQL_DB_NAME | default(None) }}"
   - "{{ EDXAPP_MYSQL_CSMH_DB_NAME | default(None) }}"
   - "{{ EDX_NOTES_API_MYSQL_DB_NAME | default(None) }}"
-  - "{{ PROGRAMS_DEFAULT_DB_NAME | default(None) }}"
   - "{{ ANALYTICS_API_DEFAULT_DB_NAME | default(None) }}"
   - "{{ ANALYTICS_API_REPORTS_DB_NAME | default(None) }}"
   - "{{ CREDENTIALS_DEFAULT_DB_NAME | default(None) }}"
@@ -43,11 +42,6 @@ edxlocal_database_users:
       pass: "{{ EDXAPP_MYSQL_CSMH_PASSWORD | default(None) }}"
     }
   - {
-      db: "{{ PROGRAMS_DEFAULT_DB_NAME | default(None) }}",
-      user: "{{ PROGRAMS_DATABASE_USER | default(None) }}",
-      pass: "{{ PROGRAMS_DATABASE_PASSWORD | default(None) }}"
-    }
-  - {
       db: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_NAME | default(None) }}",
       user: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_USER | default(None) }}",
       pass: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_PASSWORD | default(None) }}"

playbooks/roles/launch_ec2/tasks/main.yml

@@ -79,7 +79,7 @@
     value: "{{ item[0].public_dns_name }}"
   with_nested:
     - "{{ ec2.instances }}"
-    - ['studio', 'ecommerce', 'preview', 'programs', 'discovery', 'credentials']
+    - ['studio', 'ecommerce', 'preview', 'discovery', 'credentials']
 
 - name: Add new instance to host group
   local_action:

playbooks/roles/local_dev/defaults/main.yml

@@ -56,13 +56,6 @@ localdev_accounts:
       }
 
     - {
-        user: "{{ programs_user|default('None') }}",
-        home: "{{ programs_home|default('None') }}",
-        env: "programs_env",
-        repo: "programs"
-      }
-
-    - {
         user: "{{ credentials_user|default('None') }}",
         home: "{{ credentials_home|default('None') }}",
         env: "credentials_env",

playbooks/roles/nginx/defaults/main.yml

@@ -82,7 +82,6 @@ NGINX_EDXAPP_ERROR_PAGES:
 
 CMS_HOSTNAME: '~^((stage|prod)-)?studio.*'
 ECOMMERCE_HOSTNAME: '~^((stage|prod)-)?ecommerce.*'
-PROGRAMS_HOSTNAME: '~^((stage|prod)-)?programs.*'
 CREDENTIALS_HOSTNAME: '~^((stage|prod)-)?credentials.*'
 
 nginx_template_dir: "edx/app/nginx/sites-available"
@@ -107,8 +106,6 @@ nginx_edx_notes_api_gunicorn_hosts:
   - 127.0.0.1
 nginx_ecommerce_gunicorn_hosts:
   - 127.0.0.1
-nginx_programs_gunicorn_hosts:
-  - 127.0.0.1
 nginx_credentails_gunicorn_hosts:
   - 127.0.0.1
 
@@ -135,7 +132,6 @@ EDXAPP_CMS_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 EDXAPP_LMS_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 EDXAPP_LMS_PREVIEW_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 KIBANA_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
-PROGRAMS_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 XQUEUE_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 XSERVER_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 
@@ -147,7 +143,6 @@ NGINX_CREATE_HTPASSWD_FILE: >
     EDXAPP_LMS_ENABLE_BASIC_AUTH|bool or
     EDXAPP_LMS_PREVIEW_ENABLE_BASIC_AUTH|bool or
     KIBANA_ENABLE_BASIC_AUTH|bool or
-    PROGRAMS_ENABLE_BASIC_AUTH|bool or
     XQUEUE_ENABLE_BASIC_AUTH|bool or
     XSERVER_ENABLE_BASIC_AUTH|bool
   }}

playbooks/roles/nginx/templates/edx/app/nginx/sites-available/programs.j2

-#
-# {{ ansible_managed }}
-#
-
-
-{% if "programs" in nginx_default_sites %}
-  {% set default_site = "default_server" %}
-{% else %}
-  {% set default_site = "" %}
-{% endif %}
-
-upstream programs_app_server {
-{% for host in nginx_programs_gunicorn_hosts %}
-    server {{ host }}:{{ programs_gunicorn_port }} fail_timeout=0;
-{% endfor %}
-}
-
-server {
-  server_name {{ PROGRAMS_HOSTNAME }};
-  
-  listen {{ PROGRAMS_NGINX_PORT }} {{ default_site }};
-
-  {% include "common-settings.j2" %}
-  
-  {% if NGINX_ENABLE_SSL %}
-
-  listen {{ PROGRAMS_SSL_NGINX_PORT }} ssl;
-
-  ssl_certificate /etc/ssl/certs/{{ NGINX_SSL_CERTIFICATE|basename }};
-  ssl_certificate_key /etc/ssl/private/{{ NGINX_SSL_KEY|basename }};
-  # Request that the browser use SSL for all connections.
-  add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
-
-  {% endif %}
-
-  # Nginx does not support nested condition or or conditions so
-  # there is an unfortunate mix of conditonals here.
-  {% if NGINX_REDIRECT_TO_HTTPS %}
-     {% if NGINX_HTTPS_REDIRECT_STRATEGY == "scheme" %}
-  # Redirect http to https over single instance
-  if ($scheme != "https") 
-  { 
-   set $do_redirect_to_https "true";
-  }
-
-     {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
-
-  # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
-  if ($http_x_forwarded_proto = "http") 
-  {
-   set $do_redirect_to_https "true";
-  }
-     {% endif %}
-
-  # Execute the actual redirect
-  if ($do_redirect_to_https = "true")
-  {
-  return 301 https://$host$request_uri;
-  }
-  {% endif %}
-
-  location ~ ^/static/(?P<file>.*) {
-    root {{ PROGRAMS_DATA_DIR  }};
-    try_files /staticfiles/$file =404;
-
-    # Request that the browser use SSL for these connections. Repeated here
-    # because add_header directives are only inherited from the previous level
-    # if there are no add_header directives defined on the current level.
-    # See: http://nginx.org/en/docs/http/ngx_http_headers_module.html#add_header.
-    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
-    
-    # Instruct the browser to cache static assets for one hour.
-    add_header Cache-Control "public; max-age=3600";
-  }
-
-  location ~ ^/media/(?P<file>.*) {
-    root {{ PROGRAMS_DATA_DIR }};
-    try_files /media/$file =404;
-    # django / app always assigns new filenames so these can be cached forever.
-    add_header Cache-Control "public; max-age=31536000";
-  }
-
-  location / {
-    {% if PROGRAMS_ENABLE_BASIC_AUTH|bool %}
-      {% include "basic-auth.j2" %}
-    {% endif %}
-    try_files $uri @proxy_to_app;
-  }
-
-  # The API should be secured with OAuth 2.0 or or JWT.
-  location /api {
-    try_files $uri @proxy_to_app;
-  }
-
-  {% include "robots.j2" %}
-
-location @proxy_to_app {
-    {% if NGINX_SET_X_FORWARDED_HEADERS %}
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-Port $server_port;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    {% else %}
-    proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
-    proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
-    proxy_set_header X-Forwarded-For $http_x_forwarded_for;
-    {% endif %}
-
-    # newrelic-specific header records the time when nginx handles a request.
-    proxy_set_header X-Queue-Start "t=${msec}";
-
-    proxy_set_header Host $http_host;
-
-    proxy_redirect off;
-    proxy_pass http://programs_app_server;
-  }
-
-}

playbooks/roles/oauth_client_setup/defaults/main.yml

@@ -9,7 +9,7 @@
 #
 ##
 # Defaults for role oauth_client_setup
-# 
+#
 
 #
 # vars are namespaced with the module name.
@@ -32,13 +32,6 @@ oauth_client_setup_oauth2_clients:
         logout_uri: "{{ INSIGHTS_LOGOUT_URL | default('None') }}"
       }
     - {
-        name: "{{ programs_service_name | default('None') }}",
-        url_root: "{{ PROGRAMS_URL_ROOT | default('None') }}",
-        id: "{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY | default('None') }}",
-        secret: "{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET | default('None') }}",
-        logout_uri: "{{ PROGRAMS_LOGOUT_URL | default('None') }}"
-      }
-    - {
         name: "{{ credentials_service_name | default('None') }}",
         url_root: "{{ CREDENTIALS_URL_ROOT | default('None') }}",
         id: "{{ CREDENTIALS_SOCIAL_AUTH_EDX_OIDC_KEY | default('None') }}",

playbooks/roles/programs/defaults/main.yml

----
-#
-# edX Configuration
-#
-# github:     https://github.com/edx/configuration
-# wiki:       https://openedx.atlassian.net/wiki/display/OpenOPS
-# code style: https://openedx.atlassian.net/wiki/display/OpenOPS/Ansible+Code+Conventions
-# license:    https://github.com/edx/configuration/blob/master/LICENSE.TXT
-#
-##
-# Defaults for role programs
-# 
-PROGRAMS_GIT_IDENTITY: !!null
-
-# depends upon Newrelic being enabled via COMMON_ENABLE_NEWRELIC
-# and a key being provided via NEWRELIC_LICENSE_KEY
-PROGRAMS_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ programs_service_name }}"
-PROGRAMS_PIP_EXTRA_ARGS: "-i {{ COMMON_PYPI_MIRROR_URL }}"
-PROGRAMS_NGINX_PORT: 18140
-PROGRAMS_SSL_NGINX_PORT: 48140
-
-PROGRAMS_DEFAULT_DB_NAME: 'programs'
-
-PROGRAMS_DATABASE_USER: 'programs001'
-PROGRAMS_DATABASE_PASSWORD: 'password'
-PROGRAMS_DATABASE_HOST: 'localhost'
-PROGRAMS_DATABASE_PORT: 3306
-
-PROGRAMS_DATABASES:
-  # rw user
-  default:
-    ENGINE: 'django.db.backends.mysql'
-    NAME: '{{ PROGRAMS_DEFAULT_DB_NAME }}'
-    USER: '{{ PROGRAMS_DATABASE_USER }}'
-    PASSWORD: '{{ PROGRAMS_DATABASE_PASSWORD }}'
-    HOST: '{{ PROGRAMS_DATABASE_HOST }}'
-    PORT: '{{ PROGRAMS_DATABASE_PORT }}'
-    ATOMIC_REQUESTS: true
-    CONN_MAX_AGE: 60
-
-PROGRAMS_VERSION: "master"
-PROGRAMS_DJANGO_SETTINGS_MODULE: "programs.settings.production"
-PROGRAMS_URL_ROOT: 'http://localhost:8004'
-PROGRAMS_LOGOUT_URL: '{{ PROGRAMS_URL_ROOT }}/accounts/logout/'
-PROGRAMS_LMS_URL_ROOT: 'http://127.0.0.1:8000'
-PROGRAMS_ORGANIZATIONS_API_URL_ROOT: '{{ PROGRAMS_LMS_URL_ROOT }}/api/organizations/v0/'
-
-PROGRAMS_SECRET_KEY: 'Your secret key here'
-PROGRAMS_TIME_ZONE: 'UTC'
-PROGRAMS_LANGUAGE_CODE: 'en-us'
-
-# Used to automatically configure OAuth2 Client
-PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY : 'programs-key'
-PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET : 'programs-secret'
-PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
-PROGRAMS_OAUTH_URL_ROOT: '{{ PROGRAMS_LMS_URL_ROOT }}/oauth2'
-PROGRAMS_SOCIAL_AUTH_EDX_OIDC_LOGOUT_URL: '{{ PROGRAMS_LMS_URL_ROOT }}/logout'
-
-PROGRAMS_JWT_AUDIENCE: '{{ EDXAPP_JWT_AUDIENCE | default("SET-ME-PLEASE") }}'
-PROGRAMS_JWT_ISSUER: '{{ PROGRAMS_OAUTH_URL_ROOT }}'
-PROGRAMS_JWT_SECRET_KEY: '{{ EDXAPP_JWT_SECRET_KEY | default("lms-secret") }}'
-
-PROGRAMS_JWT_AUTH: 
-  JWT_ISSUERS:
-    - AUDIENCE: '{{ PROGRAMS_JWT_AUDIENCE }}'
-      ISSUER: '{{ PROGRAMS_JWT_ISSUER }}'
-      SECRET_KEY: '{{ PROGRAMS_JWT_SECRET_KEY }}'
-    - AUDIENCE: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY }}'
-      ISSUER: '{{ PROGRAMS_OAUTH_URL_ROOT }}'
-      SECRET_KEY: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET }}'
-
-PROGRAMS_PLATFORM_NAME: 'Your Platform Name Here'
-
-# CORS
-# See: https://github.com/ottoyiu/django-cors-headers/.
-# the whitelist should always contain the public hostname for Studio in the given environment.
-PROGRAMS_CORS_ORIGIN_WHITELIST:
-  - '127.0.0.1:8001'
-
-PROGRAMS_DATA_DIR: '{{ COMMON_DATA_DIR }}/{{ programs_service_name }}'
-PROGRAMS_MEDIA_ROOT: '{{ PROGRAMS_DATA_DIR }}/media'
-PROGRAMS_MEDIA_URL: '/media/'
-
-# Example settings to use Amazon S3 as a storage backend for user-uploaded files
-# https://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html#amazon-s3
-#
-# This is only for user-uploaded files and does not cover static assets that ship
-# with the code.
-#
-# Note, AWS_S3_CUSTOM_DOMAIN is required, otherwise boto will generate non-working
-# querystring URLs for assets (see https://github.com/boto/boto/issues/1477)
-#
-# Note, set AWS_S3_CUSTOM_DOMAIN to the cloudfront domain instead, when that is in use.
-#
-# PROGRAMS_BUCKET: mybucket
-# programs_s3_domain: s3.amazonaws.com
-# PROGRAMS_MEDIA_ROOT: 'media'   # NOTE use '$source_ip/media' for an edx sandbox
-#
-# PROGRAMS_MEDIA_STORAGE_BACKEND:
-#   DEFAULT_FILE_STORAGE: 'programs.apps.core.s3utils.MediaS3BotoStorage'
-#   MEDIA_ROOT: '{{ PROGRAMS_MEDIA_ROOT }}'
-#   MEDIA_URL: 'https://{{ PROGRAMS_BUCKET }}.{{ programs_s3_domain }}/{{ PROGRAMS_MEDIA_ROOT }}/'
-#   AWS_STORAGE_BUCKET_NAME: '{{ PROGRAMS_BUCKET }}'
-#   AWS_S3_CUSTOM_DOMAIN: '{{ PROGRAMS_BUCKET }}.{{ programs_s3_domain }}'
-#   AWS_QUERYSTRING_AUTH: false
-#   AWS_QUERYSTRING_EXPIRE: false
-#   AWS_DEFAULT_ACL: ''
-#   AWS_HEADERS:
-#     Cache-Control: max-age=31536000
-#
-#
-PROGRAMS_MEDIA_STORAGE_BACKEND:
-  DEFAULT_FILE_STORAGE: 'django.core.files.storage.FileSystemStorage'
-  MEDIA_ROOT: '{{ PROGRAMS_MEDIA_ROOT }}'
-  MEDIA_URL: '{{ PROGRAMS_MEDIA_URL }}'
-
-PROGRAMS_SERVICE_CONFIG:
-  SECRET_KEY: '{{ PROGRAMS_SECRET_KEY }}'
-  TIME_ZONE: '{{ PROGRAMS_TIME_ZONE }}'
-  LANGUAGE_CODE: '{{ PROGRAMS_LANGUAGE_CODE }}'
-
-  SOCIAL_AUTH_EDX_OIDC_KEY: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY }}'
-  SOCIAL_AUTH_EDX_OIDC_SECRET: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET }}'
-  SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET }}'
-  SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ PROGRAMS_OAUTH_URL_ROOT }}'
-  SOCIAL_AUTH_EDX_OIDC_LOGOUT_URL: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_LOGOUT_URL }}'
-  SOCIAL_AUTH_REDIRECT_IS_HTTPS: '{{ PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS }}'
-
-  STATIC_ROOT: '{{ PROGRAMS_DATA_DIR }}/staticfiles'
-  # db config
-  DATABASE_OPTIONS:
-    connect_timeout: 10
-  DATABASES: '{{ PROGRAMS_DATABASES }}'
-
-  PLATFORM_NAME: '{{ PROGRAMS_PLATFORM_NAME }}'
-
-  CORS_ORIGIN_WHITELIST: '{{ PROGRAMS_CORS_ORIGIN_WHITELIST }}'
-
-  PUBLIC_URL_ROOT: '{{ PROGRAMS_URL_ROOT }}'
-  ORGANIZATIONS_API_URL_ROOT: '{{ PROGRAMS_ORGANIZATIONS_API_URL_ROOT }}'
-  
-  # This hash contains top-level Django settings and must be unpacked
-  # when loading/overriding settings.
-  MEDIA_STORAGE_BACKEND: '{{ PROGRAMS_MEDIA_STORAGE_BACKEND }}'
-  
-  JWT_AUTH: '{{ PROGRAMS_JWT_AUTH }}'
-
-PROGRAMS_REPOS:
-  - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
-    DOMAIN: "{{ COMMON_GIT_MIRROR }}"
-    PATH: "{{ COMMON_GIT_PATH }}"
-    REPO: programs.git
-    VERSION: "{{ PROGRAMS_VERSION }}"
-    DESTINATION: "{{ programs_code_dir }}"
-    SSH_KEY: "{{ PROGRAMS_GIT_IDENTITY }}"
-
-
-PROGRAMS_GUNICORN_WORKERS: "2"
-PROGRAMS_GUNICORN_EXTRA: ""
-PROGRAMS_GUNICORN_EXTRA_CONF: ""
-PROGRAMS_GUNICORN_WORKER_CLASS: "gevent"
-
-#
-# vars are namespace with the module name.
-#
-programs_role_name: programs
-programs_venv_dir: "{{ programs_home }}/venvs/{{ programs_service_name }}"
-
-programs_service_name: "programs"
-programs_user: "{{ programs_service_name }}"
-programs_home: "{{ COMMON_APP_DIR }}/{{ programs_service_name }}"
-programs_code_dir: "{{ programs_home }}/{{ programs_service_name }}"
-
-programs_environment:
-  DJANGO_SETTINGS_MODULE: "{{ PROGRAMS_DJANGO_SETTINGS_MODULE }}"
-  PROGRAMS_CFG: "{{ COMMON_CFG_DIR }}/{{ programs_service_name }}.yml"
-  PATH: "{{ programs_venv_dir }}/bin:{{ ansible_env.PATH }}"
-
-programs_gunicorn_host: "127.0.0.1"
-programs_gunicorn_port: 8140
-programs_gunicorn_timeout: 300
-
-programs_log_dir: "{{ COMMON_LOG_DIR }}/{{ programs_service_name }}"
-
-programs_requirements_base: "{{ programs_code_dir }}/requirements"
-programs_requirements:
-  - production.txt
-  - optional.txt
-
-#
-# OS packages
-#
-
-programs_debian_pkgs:
-  - libjpeg-dev
-  - libmysqlclient-dev
-  - libssl-dev
-  - gettext
-# Temporarily, while we get 16.04 rolled out everywhere
-# Then this goes back in common_vars
-  - python2.7
-
-programs_redhat_pkgs: []

playbooks/roles/programs/meta/main.yml

----
-#
-# edX Configuration
-#
-# github:     https://github.com/edx/configuration
-# wiki:       https://openedx.atlassian.net/wiki/display/OpenOPS
-# code style: https://openedx.atlassian.net/wiki/display/OpenOPS/Ansible+Code+Conventions
-# license:    https://github.com/edx/configuration/blob/master/LICENSE.TXT
-#
-##
-# Role includes for role programs
-# 
-# Example:
-#
-# dependencies:
-#   - {
-#   role: my_role 
-#   my_role_var0: "foo"
-#   my_role_var1: "bar"
-# }
-dependencies:
-  - common
-  - supervisor
-  - role: edx_service
-    edx_service_name: "{{ programs_service_name }}"
-    edx_service_config: "{{ PROGRAMS_SERVICE_CONFIG }}"
-    edx_service_repos: "{{ PROGRAMS_REPOS }}"
-    edx_service_user: "{{ programs_user }}"
-    edx_service_home: "{{ programs_home }}"
-    edx_service_packages:
-      debian: "{{ programs_debian_pkgs }}"
-      redhat: "{{ programs_redhat_pkgs }}"
-

playbooks/roles/programs/tasks/main.yml

----
-#
-# edX Configuration
-#
-# github:     https://github.com/edx/configuration
-# wiki:       https://openedx.atlassian.net/wiki/display/OpenOPS
-# code style: https://openedx.atlassian.net/wiki/display/OpenOPS/Ansible+Code+Conventions
-# license:    https://github.com/edx/configuration/blob/master/LICENSE.TXT
-#
-#
-#
-# Tasks for role programs
-# 
-# Overview:
-# 
-#
-# Dependencies:
-#
-# 
-# Example play:
-#
-#
-
-- name: add gunicorn configuration file
-  template:
-    src: edx/app/programs/programs_gunicorn.py.j2
-    dest: "{{ programs_home }}/programs_gunicorn.py"
-  become_user: "{{ programs_user }}"
-  tags:
-    - install
-    - install:configuration
-
-- name: install application requirements
-  pip:
-    requirements: "{{ programs_requirements_base }}/{{ item }}"
-    # Ansible will initialize this virtualenv if it's missing.
-    virtualenv: "{{ programs_venv_dir }}"
-    state: present
-  become_user: "{{ programs_user }}"
-  with_items: "{{ programs_requirements }}"
-  tags:
-    - install
-    - install:app-requirements
-
-- name: migrate
-  shell: >
-    chdir={{ programs_code_dir }}
-    DB_MIGRATION_USER={{ COMMON_MYSQL_MIGRATE_USER }}
-    DB_MIGRATION_PASS={{ COMMON_MYSQL_MIGRATE_PASS }}
-    {{ programs_venv_dir }}/bin/python ./manage.py migrate --noinput
-  become_user: "{{ programs_user }}"
-  environment: "{{ programs_environment }}"
-  when: migrate_db is defined and migrate_db|lower == "yes"
-  tags:
-    - migrate
-    - migrate:db
-
-- name: run collectstatic
-  shell: "{{ programs_venv_dir }}/bin/python manage.py collectstatic --noinput"
-  args:
-    chdir: "{{ programs_code_dir }}"
-  become_user: "{{ programs_user }}"
-  environment: "{{ programs_environment }}"
-  when: not devstack
-  tags:
-    - assets
-    - assets:gather
-
-# NOTE this isn't used or needed when s3 is used for PROGRAMS_MEDIA_STORAGE_BACKEND
-- name: create programs media dir
-  file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0775
-    owner: "{{ programs_user }}"
-    group: "{{ common_web_group }}"
-  with_items:
-    - "{{ PROGRAMS_MEDIA_ROOT }}"
-  tags:
-    - install
-    - install:base
-
-- name: write out the supervisor wrapper
-  template:
-    src: "edx/app/programs/programs.sh.j2"
-    dest: "{{ programs_home }}/{{ programs_service_name }}.sh"
-    mode: 0650
-    owner: "{{ supervisor_user }}"
-    group: "{{ common_web_user }}"
-  tags:
-    - install
-    - install:configuration
-
-- name: write supervisord config
-  template:
-    src: "edx/app/supervisor/conf.d.available/programs.conf.j2"
-    dest: "{{ supervisor_available_dir }}/{{ programs_service_name }}.conf"
-    owner: "{{ supervisor_user }}"
-    group: "{{ common_web_user }}"
-    mode: 0644
-  tags:
-    - install
-    - install:configuration
-
-- name: setup the programs env file
-  template:
-    src: "./{{ programs_home }}/{{ programs_service_name }}_env.j2"
-    dest: "{{ programs_home }}/programs_env"
-    owner: "{{ programs_user }}"
-    group: "{{ programs_user }}"
-    mode: 0644
-  tags:
-    - install
-    - install:configuration
-
-- name: enable supervisor script
-  file:
-    src: "{{ supervisor_available_dir }}/{{ programs_service_name }}.conf"
-    dest: "{{ supervisor_cfg_dir }}/{{ programs_service_name }}.conf"
-    state: link
-    force: yes
-  when: not disable_edx_services
-  tags:
-    - install
-    - install:configuration
-
-- name: update supervisor configuration
-  shell: "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update"
-  when: not disable_edx_services
-  tags:
-    - manage
-    - manage:start
-
-- name: create symlinks from the venv bin dir
-  file:
-    src: "{{ programs_venv_dir }}/bin/{{ item }}"
-    dest: "{{ COMMON_BIN_DIR }}/{{ item.split('.')[0] }}.programs"
-    state: link
-  with_items:
-  - python
-  - pip
-  - django-admin.py
-  tags:
-    - install
-    - install:app-requirements
-
-- name: create symlinks from the repo dir
-  file:
-    src: "{{ programs_code_dir }}/{{ item }}"
-    dest: "{{ COMMON_BIN_DIR }}/{{ item.split('.')[0] }}.programs"
-    state: link
-  with_items:
-  - manage.py
-  tags:
-    - install
-    - install:app-requirements
-
-- name: restart the application
-  supervisorctl: 
-    state: restarted
-    supervisorctl_path: "{{ supervisor_ctl }}"
-    config: "{{ supervisor_cfg }}"
-    name: "{{ programs_service_name }}"
-  when: not disable_edx_services
-  become_user: "{{ supervisor_service_user }}"
-  tags:
-    - manage
-    - manage:start

playbooks/roles/programs/templates/edx/app/programs/programs.sh.j2

-#!/usr/bin/env bash
-
-# {{ ansible_managed }}
-
-{% set programs_venv_bin = programs_home + "/venvs/" + programs_service_name + "/bin" %}
-{% if COMMON_ENABLE_NEWRELIC_APP %}
-{% set executable = programs_venv_bin + '/newrelic-admin run-program ' + programs_venv_bin + '/gunicorn' %}
-{% else %}
-{% set executable = programs_venv_bin + '/gunicorn' %}
-{% endif %}
-
-{% if COMMON_ENABLE_NEWRELIC_APP %}
-export NEW_RELIC_APP_NAME="{{ PROGRAMS_NEWRELIC_APPNAME }}"
-export NEW_RELIC_LICENSE_KEY="{{ NEWRELIC_LICENSE_KEY }}"
-{% endif -%}
-
-source {{ programs_home }}/programs_env
-{{ executable }} -c {{ programs_home }}/programs_gunicorn.py {{ PROGRAMS_GUNICORN_EXTRA }} programs.wsgi:application

playbooks/roles/programs/templates/edx/app/programs/programs_env.j2

-# {{ ansible_managed }}
-
-{% for name,value in programs_environment.items() -%}
-{%- if value -%}
-export {{ name }}="{{ value }}"
-{% endif %}
-{%- endfor %}

playbooks/roles/programs/templates/edx/app/programs/programs_gunicorn.py.j2

-"""
-gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html
-{{ ansible_managed }}
-"""
-
-timeout = {{ programs_gunicorn_timeout }}
-bind = "{{ programs_gunicorn_host }}:{{ programs_gunicorn_port }}"
-pythonpath = "{{ programs_code_dir }}"
-workers = {{ PROGRAMS_GUNICORN_WORKERS }}
-worker_class = "{{ PROGRAMS_GUNICORN_WORKER_CLASS }}"
-
-{{ PROGRAMS_GUNICORN_EXTRA_CONF }}

playbooks/roles/programs/templates/edx/app/supervisor/conf.d.available/programs.conf.j2

-#
-# {{ ansible_managed }}
-# 
-[program:{{ programs_service_name }}]
-
-command={{ programs_home }}/{{ programs_service_name }}.sh
-user={{ common_web_user }}
-directory={{ programs_code_dir }}
-stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
-stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
-killasgroup=true
-stopasgroup=true

playbooks/roles/supervisor/defaults/main.yml

@@ -67,10 +67,6 @@ supervisor_spec:
     python: python.analytics_api
     code: "{{ analytics_api_code_dir | default(None) }}"
     env: "{{ analytics_api_home | default(None) }}/analytics_api_env"
-  - service: programs
-    python: python.programs
-    code: "{{ programs_code_dir | default(None) }}"
-    env: "{{ programs_home | default(None) }}/programs_env"
   - service: credentials
     python: python.credentials
     code: "{{ credentials_code_dir | default(None) }}"

playbooks/roles/supervisor/files/pre_supervisor_checks.py

@@ -15,7 +15,6 @@ MIGRATION_COMMANDS = {
         'cms':     "/edx/bin/edxapp-migrate-cms --noinput --list",
         'xqueue':  "SERVICE_VARIANT=xqueue sudo -E -u xqueue {python} {code_dir}/manage.py migrate --noinput --list --settings=xqueue.aws_settings",
         'ecommerce':     ". {env_file}; sudo -E -u ecommerce {python} {code_dir}/manage.py showmigrations",
-        'programs':      ". {env_file}; sudo -E -u programs {python} {code_dir}/manage.py showmigrations",
         'insights':      ". {env_file}; sudo -E -u insights {python} {code_dir}/manage.py showmigrations",
         'analytics_api': ". {env_file}; sudo -E -u analytics_api {python} {code_dir}/manage.py showmigrations",
         'credentials':   ". {env_file}; sudo -E -u credentials {python} {code_dir}/manage.py showmigrations",
@@ -96,15 +95,6 @@ if __name__ == '__main__':
     ecom_migration_args.add_argument("--ecommerce-code-dir",
         help="Location of the ecommerce code.")
 
-    programs_migration_args = parser.add_argument_group("programs_migrations",
-            "Args for running programs migration checks.")
-    programs_migration_args.add_argument("--programs-python",
-        help="Path to python to use for executing migration check.")
-    programs_migration_args.add_argument("--programs-env",
-        help="Location of the programs environment file.")
-    programs_migration_args.add_argument("--programs-code-dir",
-        help="Location of the programs code.")
-
     credentials_migration_args = parser.add_argument_group("credentials_migrations",
             "Args for running credentials migration checks.")
     credentials_migration_args.add_argument("--credentials-python",
@@ -210,7 +200,7 @@ if __name__ == '__main__':
     try:
         #get the list of the volumes, that are attached to the instance
         volumes = ec2.get_all_volumes(filters={'attachment.instance-id': instance_id})
-    
+
         for volume in volumes:
             volume.add_tags({"hostname": hostname,
                              "environment": environment,
@@ -242,7 +232,6 @@ if __name__ == '__main__':
                         "lms": {'python': args.edxapp_python, 'env_file': args.edxapp_env, 'code_dir': args.edxapp_code_dir},
                         "cms": {'python': args.edxapp_python, 'env_file': args.edxapp_env, 'code_dir': args.edxapp_code_dir},
                         "ecommerce": {'python': args.ecommerce_python, 'env_file': args.ecommerce_env, 'code_dir': args.ecommerce_code_dir},
-                        "programs": {'python': args.programs_python, 'env_file': args.programs_env, 'code_dir': args.programs_code_dir},
                         "credentials": {'python': args.credentials_python, 'env_file': args.credentials_env, 'code_dir': args.credentials_code_dir},
                         "discovery": {'python': args.discovery_python, 'env_file': args.discovery_env, 'code_dir': args.discovery_code_dir},
                         "insights": {'python': args.insights_python, 'env_file': args.insights_env, 'code_dir': args.insights_code_dir},

playbooks/roles/supervisor/templates/etc/init/pre_supervisor.conf.j2

@@ -3,12 +3,6 @@ description     "Tasks before supervisord"
 start on runlevel [2345]
 task
 
-{% if programs_code_dir is defined %}
-  {% set programs_command = "--programs-env " + programs_home + "/programs_env --programs-code-dir " + programs_code_dir + " --programs-python " + COMMON_BIN_DIR + "/python.programs" %}
-{% else %}
-  {% set programs_command = "" %}
-{% endif %}
-
 {% if credentials_code_dir is defined %}
   {% set credentials_command = "--credentials-env " + credentials_home + "/credentials_env --credentials-code-dir " + credentials_code_dir + " --credentials-python " + COMMON_BIN_DIR + "/python.credentials" %}
 {% else %}
@@ -22,4 +16,4 @@ task
 {% endif %}
 
 
-exec {{ supervisor_venv_dir }}/bin/python {{ supervisor_app_dir }}/pre_supervisor_checks.py --available={{ supervisor_available_dir }} --enabled={{ supervisor_cfg_dir }} {% if SUPERVISOR_HIPCHAT_API_KEY is defined %}--hipchat-api-key {{ SUPERVISOR_HIPCHAT_API_KEY }} --hipchat-room {{ SUPERVISOR_HIPCHAT_ROOM }} {% endif %} {% if edxapp_code_dir is defined %}--edxapp-python {{ COMMON_BIN_DIR }}/python.edxapp --edxapp-code-dir {{ edxapp_code_dir }} --edxapp-env {{ edxapp_app_dir }}/edxapp_env{% endif %} {% if xqueue_code_dir is defined %}--xqueue-code-dir {{ xqueue_code_dir }} --xqueue-python {{ COMMON_BIN_DIR }}/python.xqueue {% endif %} {% if ecommerce_code_dir is defined %}--ecommerce-env {{ ecommerce_home }}/ecommerce_env --ecommerce-code-dir {{ ecommerce_code_dir }} --ecommerce-python {{ COMMON_BIN_DIR }}/python.ecommerce {% endif %} {% if insights_code_dir is defined %}--insights-env {{ insights_home }}/insights_env --insights-code-dir {{ insights_code_dir }} --insights-python {{ COMMON_BIN_DIR }}/python.insights {% endif %} {% if analytics_api_code_dir is defined %}--analytics-api-env {{ analytics_api_home }}/analytics_api_env --analytics-api-code-dir {{ analytics_api_code_dir }} --analytics-api-python {{ COMMON_BIN_DIR }}/python.analytics_api {% endif %} {{ programs_command }} {{ discovery_command }} {{ credentials_command }}
+exec {{ supervisor_venv_dir }}/bin/python {{ supervisor_app_dir }}/pre_supervisor_checks.py --available={{ supervisor_available_dir }} --enabled={{ supervisor_cfg_dir }} {% if SUPERVISOR_HIPCHAT_API_KEY is defined %}--hipchat-api-key {{ SUPERVISOR_HIPCHAT_API_KEY }} --hipchat-room {{ SUPERVISOR_HIPCHAT_ROOM }} {% endif %} {% if edxapp_code_dir is defined %}--edxapp-python {{ COMMON_BIN_DIR }}/python.edxapp --edxapp-code-dir {{ edxapp_code_dir }} --edxapp-env {{ edxapp_app_dir }}/edxapp_env{% endif %} {% if xqueue_code_dir is defined %}--xqueue-code-dir {{ xqueue_code_dir }} --xqueue-python {{ COMMON_BIN_DIR }}/python.xqueue {% endif %} {% if ecommerce_code_dir is defined %}--ecommerce-env {{ ecommerce_home }}/ecommerce_env --ecommerce-code-dir {{ ecommerce_code_dir }} --ecommerce-python {{ COMMON_BIN_DIR }}/python.ecommerce {% endif %} {% if insights_code_dir is defined %}--insights-env {{ insights_home }}/insights_env --insights-code-dir {{ insights_code_dir }} --insights-python {{ COMMON_BIN_DIR }}/python.insights {% endif %} {% if analytics_api_code_dir is defined %}--analytics-api-env {{ analytics_api_home }}/analytics_api_env --analytics-api-code-dir {{ analytics_api_code_dir }} --analytics-api-python {{ COMMON_BIN_DIR }}/python.analytics_api {% endif %} {{ discovery_command }} {{ credentials_command }}

playbooks/sample_vars/passwords.yml

 # This file is used to generate overriden, unique secrets
 # for Open edX deployment environments
-# 
+#
 # The current process is described here: https://openedx.atlassian.net/wiki/x/dQArCQ
 #
 
@@ -45,7 +45,6 @@ NOTIFIER_COMMENT_SERVICE_API_KEY: '{{ FORUM_API_KEY }}'
 NOTIFIER_EMAIL_PASS: !!null
 NOTIFIER_USER_SERVICE_HTTP_AUTH_PASS: !!null
 POSTFIX_QUEUE_EXTERNAL_SMTP_PASSWORD: !!null
-PROGRAMS_DATABASE_PASSWORD: !!null
 REDIS_PASSWORD: !!null
 SPLUNKFORWARDER_PASSWORD: !!null
 SPLUNK_SMTP_PASSWORD: !!null
@@ -64,7 +63,7 @@ FORUM_MONGO_USER: "cs_comments_service"
 FORUM_MONGO_PASSWORD: !!null
 
 RABBIT_ADMIN_PASSWORD: !!null
-  
+
 # Secret keys for Django Applicatons
 ANALYTICS_API_SECRET_KEY: !!null #SECRET_KEY
 CREDENTIALS_SECRET_KEY: !!null #SECRET_KEY
@@ -75,8 +74,7 @@ EDXAPP_EDXAPP_SECRET_KEY: !!null #SECRET_KEY
 EDXAPP_PROFILE_IMAGE_SECRET_KEY:  !!null #SECRET_KEY
 INSIGHTS_SECRET_KEY: !!null #SECRET_KEY
 NOTIFIER_LMS_SECRET_KEY: !!null #SECRET_KEY
-PROGRAMS_SECRET_KEY: !!null #SECRET_KEY
-  
+
 MONGO_USERS:
   - user: "{{ FORUM_MONGO_USER }}"
     password: "{{ FORUM_MONGO_PASSWORD }}"

playbooks/sample_vars/server_vars.yml

@@ -31,10 +31,6 @@
 #ECOMMERCE_LMS_URL_ROOT: "https://${deploy_host}"
 #ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 #
-#PROGRAMS_LMS_URL_ROOT: "https://${deploy_host}"
-#PROGRAMS_URL_ROOT: "https://programs-${deploy_host}"
-#PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
-#
 #CREDENTIALS_LMS_URL_ROOT: "https://${deploy_host}"
 #CREDENTIALS_URL_ROOT: "https://credentials-${deploy_host}"
 #CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true

playbooks/vagrant-analytics.yml

@@ -28,7 +28,6 @@
     - forum
     - ecommerce
     - ecomworker
-    - programs
     - role: notifier
       NOTIFIER_DIGEST_TASK_INTERVAL: "5"
     - analytics_api

playbooks/vagrant-devstack.yml

@@ -35,7 +35,6 @@
     - ecommerce
     - role: ecomworker
       ECOMMERCE_WORKER_BROKER_HOST: 127.0.0.1
-    - programs
     - role: notifier
       NOTIFIER_DIGEST_TASK_INTERVAL: "5"
     - browsers

util/install/sandbox.sh

@@ -52,7 +52,6 @@ VERSION_VARS=(
   ANALYTICS_API_VERSION
   ECOMMERCE_VERSION
   ECOMMERCE_WORKER_VERSION
-  PROGRAMS_VERSION
 )
 
 EXTRA_VARS="-e SANDBOX_ENABLE_ECOMMERCE=True $EXTRA_VARS"

util/jenkins/ansible-provision.sh

@@ -193,10 +193,6 @@ ECOMMERCE_NGINX_PORT: 80
 ECOMMERCE_SSL_NGINX_PORT: 443
 ECOMMERCE_VERSION: $ecommerce_version
 
-PROGRAMS_NGINX_PORT: 80
-PROGRAMS_SSL_NGINX_PORT: 443
-PROGRAMS_VERSION: $programs_version
-
 CREDENTIALS_NGINX_PORT: 80
 CREDENTIALS_SSL_NGINX_PORT: 443
 CREDENTIALS_VERSION: $credentials_version
@@ -287,12 +283,6 @@ ECOMMERCE_ECOMMERCE_URL_ROOT: "https://ecommerce-${deploy_host}"
 ECOMMERCE_LMS_URL_ROOT: "https://${deploy_host}"
 ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 
-PROGRAMS_LMS_URL_ROOT: "https://${deploy_host}"
-PROGRAMS_URL_ROOT: "https://programs-${deploy_host}"
-PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
-PROGRAMS_CORS_ORIGIN_WHITELIST:
-  - studio-${deploy_host}
-
 CREDENTIALS_LMS_URL_ROOT: "https://${deploy_host}"
 CREDENTIALS_DOMAIN: "credentials-${deploy_host}"
 CREDENTIALS_URL_ROOT: "https://{{ CREDENTIALS_DOMAIN }}"
@@ -301,7 +291,6 @@ COURSE_DISCOVERY_ECOMMERCE_API_URL: "https://ecommerce-${deploy_host}/api/v2"
 
 DISCOVERY_URL_ROOT: "https://discovery-${deploy_host}"
 DISCOVERY_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
-DISCOVERY_PROGRAMS_API_URL: "{{ PROGRAMS_URL_ROOT }}/api/v1/"
 
 EOF
 fi
@@ -348,7 +337,7 @@ EOF
 fi
 
 declare -A deploy
-roles="edxapp forum ecommerce programs credentials discovery notifier xqueue xserver certs demo testcourses"
+roles="edxapp forum ecommerce credentials discovery notifier xqueue xserver certs demo testcourses"
 
 for role in $roles; do
     deploy[$role]=${!role}

util/parsefiles_config.yml

@@ -19,10 +19,9 @@ weights:
   - trusty-common: 5
   - precise-common: 4
   - xenial-common: 6
-  - ecommerce: 6 
+  - ecommerce: 6
   - rabbitmq: 2
   - automated: 1
-  - programs: 4
   - mysql: 2
   - elasticsearch: 7
   - docker-tools: 3

util/vagrant/upgrade.sh

@@ -333,7 +333,6 @@ echo "demo_version: $TARGET" >> vars.yml
 echo "NOTIFIER_VERSION: $TARGET" >> vars.yml
 echo "ECOMMERCE_VERSION: $TARGET" >> vars.yml
 echo "ECOMMERCE_WORKER_VERSION: $TARGET" >> vars.yml
-echo "PROGRAMS_VERSION: $TARGET" >> vars.yml
 $ANSIBLE_PLAYBOOK \
     --extra-vars="@vars.yml" \
     $SERVER_VARS \

vagrant/base/analyticstack/Vagrantfile

@@ -26,7 +26,6 @@ VERSION_VARS = [
   'NOTIFIER_VERSION',
   'ECOMMERCE_VERSION',
   'ECOMMERCE_WORKER_VERSION',
-  'PROGRAMS_VERSION',
   'ANALYTICS_API_VERSION',
   'INSIGHTS_VERSION',
 ]
@@ -46,7 +45,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.network :forwarded_port, guest: 8001, host: 8001  # Studio
     config.vm.network :forwarded_port, guest: 8002, host: 8002  # Ecommerce
     config.vm.network :forwarded_port, guest: 8003, host: 8003  # LMS for Bok Choy
-    config.vm.network :forwarded_port, guest: 8004, host: 8004  # Programs
     config.vm.network :forwarded_port, guest: 8031, host: 8031  # Studio for Bok Choy
     config.vm.network :forwarded_port, guest: 8120, host: 8120  # edX Notes Service
     config.vm.network :forwarded_port, guest: 8765, host: 8765

vagrant/base/devstack/Vagrantfile

@@ -26,7 +26,6 @@ VERSION_VARS = [
     'NOTIFIER_VERSION',
     'ECOMMERCE_VERSION',
     'ECOMMERCE_WORKER_VERSION',
-    'PROGRAMS_VERSION',
 ]
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@@ -43,7 +42,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.network :forwarded_port, guest: 8001, host: 8001  # Studio
     config.vm.network :forwarded_port, guest: 8002, host: 8002  # Ecommerce
     config.vm.network :forwarded_port, guest: 8003, host: 8003  # LMS for Bok Choy
-    config.vm.network :forwarded_port, guest: 8004, host: 8004  # Programs
     config.vm.network :forwarded_port, guest: 8031, host: 8031  # Studio for Bok Choy
     config.vm.network :forwarded_port, guest: 8120, host: 8120  # edX Notes Service
     config.vm.network :forwarded_port, guest: 8765, host: 8765

vagrant/base/fullstack/Vagrantfile

@@ -23,7 +23,6 @@ VERSION_VARS = [
     'NOTIFIER_VERSION',
     'ECOMMERCE_VERSION',
     'ECOMMERCE_WORKER_VERSION',
-    'PROGRAMS_VERSION',
 ]
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

vagrant/release/analyticstack/Vagrantfile

@@ -21,7 +21,6 @@ VERSION_VARS = [
   'NOTIFIER_VERSION',
   'ECOMMERCE_VERSION',
   'ECOMMERCE_WORKER_VERSION',
-  'PROGRAMS_VERSION',
   'ANALYTICS_API_VERSION',
   'INSIGHTS_VERSION',
 ]
@@ -32,7 +31,6 @@ MOUNT_DIRS = {
   :forum => {:repo => "cs_comments_service", :local => "/edx/app/forum/cs_comments_service", :owner => "forum"},
   :ecommerce => {:repo => "ecommerce", :local => "/edx/app/ecommerce/ecommerce", :owner => "ecommerce"},
   :ecommerce_worker => {:repo => "ecommerce-worker", :local => "/edx/app/ecommerce_worker/ecommerce_worker", :owner => "ecommerce_worker"},
-  :programs => {:repo => "programs", :local => "/edx/app/programs/programs", :owner => "programs"},
   :insights => {:repo => "insights", :local => "/edx/app/insights/edx_analytics_dashboard", :owner => "insights"},
   :analytics_api => {:repo => "analytics_api", :local => "/edx/app/analytics_api/analytics_api", :owner => "analytics_api"},
   :analytics_pipeline => {:repo => "edx-analytics-pipeline", :local => "/edx/app/analytics_pipeline/analytics_pipeline", :owner => "hadoop"},

vagrant/release/devstack/Vagrantfile

@@ -21,7 +21,6 @@ VERSION_VARS = [
     'NOTIFIER_VERSION',
     'ECOMMERCE_VERSION',
     'ECOMMERCE_WORKER_VERSION',
-    'PROGRAMS_VERSION',
 ]
 
 MOUNT_DIRS = {
@@ -30,7 +29,6 @@ MOUNT_DIRS = {
   :forum => {:repo => "cs_comments_service", :local => "/edx/app/forum/cs_comments_service", :owner => "forum"},
   :ecommerce => {:repo => "ecommerce", :local => "/edx/app/ecommerce/ecommerce", :owner => "ecommerce"},
   :ecommerce_worker => {:repo => "ecommerce-worker", :local => "/edx/app/ecommerce_worker/ecommerce_worker", :owner => "ecommerce_worker"},
-  :programs => {:repo => "programs", :local => "/edx/app/programs/programs", :owner => "programs"},
   # This src directory won't have useful permissions. You can set them from the
   # vagrant user in the guest OS. "sudo chmod 0777 /edx/src" is useful.
   :src => {:repo => "src", :local => "/edx/src", :owner => "root"},