Merge branch 'release/1.24.0'

deployment/RELEASES.md

@@ -35,7 +35,7 @@ If you cannot see columns for `Branch`, `Environment`, and `Service`, use the ge
 
 ## Release Testing
 
-After the `staging-deployment` job completes, `staging.app.wikiwatershed.org` and `staging.portal.bigcz.org` should reflect the current release. Be sure to run any outstanding database migrations or data imports.
+After the `staging-deployment` job completes, `staging.modelmywatershed.org` and `staging.portal.bigcz.org` should reflect the current release. Be sure to run any outstanding database migrations or data imports.
 
 ## AMI Promotion
 
@@ -78,7 +78,7 @@ $ ./mmw_stack.py launch-stacks --aws-profile mmw-prd \
                                --activate-dns
 ```
 
-Within 60 seconds, `app.wikiwatershed.org` and `portal.bigcz.org` should reflect the current release.
+Within 60 seconds, `modelmywatershed.org` and `portal.bigcz.org` should reflect the current release.
 
 ## Repository & Jenkins Cleanup
 

deployment/ansible/group_vars/all

@@ -25,10 +25,10 @@ postgresql_database: mmw
 postgresql_version: "9.4"
 postgresql_package_version: "9.4.*.pgdg14.04+1"
 postgresql_support_repository_channel: "main"
-postgresql_support_libpq_version: "10.5-*.pgdg14.04+1"
+postgresql_support_libpq_version: "11.1-1.pgdg14.04+1"
 postgresql_support_psycopg2_version: "2.7"
-postgis_version: "2.1"
-postgis_package_version: "2.1.*.pgdg14.04+1"
+postgis_version: "2.2"
+postgis_package_version: "2.2.*.pgdg14.04+1"
 
 elasticsearch_cluster_name: "logstash"
 
@@ -58,3 +58,7 @@ nginx_cache_dir: "/var/cache/nginx"
 observation_api_url: "http://www.wikiwatershed-vs.org/"
 
 enabled_features: ''
+
+numba_version: "0.38.1"
+
+redis_version: "2:2.8.4-2ubuntu0.2"

deployment/ansible/group_vars/development

@@ -28,7 +28,7 @@ itsi_secret_key: "{{ lookup('env', 'MMW_ITSI_SECRET_KEY') }}"
 hydroshare_base_url: "https://beta.hydroshare.org/"
 hydroshare_secret_key: "{{ lookup('env', 'MMW_HYDROSHARE_SECRET_KEY') }}"
 
-srat_catchment_api_url: "https://rychrnjrs6.execute-api.us-east-1.amazonaws.com/prod/SratRunModel"
+srat_catchment_api_url: "https://rychrnjrs6.execute-api.us-east-1.amazonaws.com/dev/SratRunModel_DEV"
 srat_catchment_api_key: "{{ lookup('env', 'MMW_SRAT_CATCHMENT_API_KEY') }}"
 
 tilecache_bucket_name: "{{ lookup('env', 'MMW_TILECACHE_BUCKET') | default('', true) }}"

deployment/ansible/group_vars/test

@@ -25,7 +25,7 @@ itsi_secret_key: "{{ lookup('env', 'MMW_ITSI_SECRET_KEY') }}"
 hydroshare_base_url: "https://beta.hydroshare.org/"
 hydroshare_secret_key: "{{ lookup('env', 'MMW_HYDROSHARE_SECRET_KEY') }}"
 
-srat_catchment_api_url: "https://rychrnjrs6.execute-api.us-east-1.amazonaws.com/prod/SratRunModel"
+srat_catchment_api_url: "https://rychrnjrs6.execute-api.us-east-1.amazonaws.com/dev/SratRunModel_DEV"
 srat_catchment_api_key: "{{ lookup('env', 'MMW_SRAT_CATCHMENT_API_KEY') }}"
 
 tilecache_bucket_name: "tile-cache.staging.app.wikiwatershed.org"

deployment/ansible/roles.yml

@@ -18,6 +18,8 @@
   version: 0.3.0
 - src: azavea.pgweb
   version: 0.2.0
+- src: azavea.python
+  version: 0.1.0
 - src: azavea.redis
   version: 0.1.0
 - src: azavea.graphite

deployment/ansible/roles/model-my-watershed.app/meta/main.yml

@@ -5,6 +5,7 @@ dependencies:
   - { role: "azavea.pip" }
   - { role: "azavea.nodejs" }
   - { role: "azavea.phantomjs" }
+  - { role: "azavea.build-essential" }
   - { role: "model-my-watershed.monitoring", collectd_prefix: "collectd.app.", when: "['test'] | is_not_in(group_names)" }
   - { role: "model-my-watershed.celery" }
   - { role: "model-my-watershed.nginx" }

deployment/ansible/roles/model-my-watershed.app/tasks/dependencies.yml

@@ -1,6 +1,9 @@
 ---
+- name: Install numba
+  pip: name=numba version={{ numba_version }}
+
 - name: Install application Python dependencies for development and test
-  pip: chdir={{ app_home }}/requirements requirements={{ item }}.txt
+  pip: requirements="{{ app_home }}/requirements/{{ item }}.txt"
   with_items:
     - development
     - test
@@ -9,7 +12,7 @@
     - Restart mmw-app
 
 - name: Install application Python dependencies for production
-  pip: chdir="{{ app_home }}/requirements" requirements=production.txt
+  pip: requirements="{{ app_home }}/requirements/production.txt"
   when: "['packer'] | is_in(group_names)"
   notify:
     - Restart mmw-app

deployment/ansible/roles/model-my-watershed.celery-worker/meta/main.yml

@@ -3,5 +3,6 @@ dependencies:
   - { role: "model-my-watershed.base" }
   - { role: "azavea.python", python_development: True }
   - { role: "azavea.pip" }
+  - { role: "azavea.build-essential" }
   - { role: "model-my-watershed.monitoring", collectd_prefix: "collectd.worker.", when: "['test'] | is_not_in(group_names)" }
   - { role: "model-my-watershed.celery" }

deployment/ansible/roles/model-my-watershed.celery-worker/tasks/dependencies.yml

@@ -1,6 +1,9 @@
 ---
+- name: Install numba
+  pip: name=numba version={{ numba_version }}
+
 - name: Install application Python dependencies for development and test
-  pip: chdir="{{ celery_dir }}/requirements" requirements={{ item }}.txt
+  pip: requirements="{{ app_home }}/requirements/{{ item }}.txt"
   with_items:
     - development
     - test
@@ -9,7 +12,7 @@
     - Restart Celery
 
 - name: Install application Python dependencies for production
-  pip: chdir="{{ celery_dir }}/requirements" requirements=production.txt
+  pip: requirements="{{ app_home }}/requirements/production.txt"
   when: "['packer'] | is_in(group_names)"
   notify:
     - Restart Celery

deployment/default.yml.example

@@ -9,7 +9,7 @@ NATInstanceAMI: ''
 BastionHostInstanceType: 't2.micro'
 BastionHostAMI: ''
 PrivateHostedZoneName: 'mmw.internal'
-PublicHostedZoneName: 'staging.app.wikiwatershed.org'
+PublicHostedZoneName: 'staging.modelmywatershed.org'
 BackwardCompatPublicHostedZoneName: 'staging.portal.bigcz.org'
 RDSInstanceType: 'db.t2.micro'
 RDSDbName: 'modelmywatershed'