Merge lp:~verterok/canonical-identity-provider/xenial-charm into lp:~ubuntuone-pqm-team/canonical-identity-provider/charm

[Guillermo Gonzalez]

make it work in xenial

Please do not land this as it will break CI, we need to coordinate landing of several branches and jenkins config updates

[Daniel Manrique (roadmr)]

LGTM

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/canonical-identity-provider_charm/1/

[lp:~verterok/canonical-identity-provider/xenial-charm]

94. By Guillermo Gonzalez on 2019-05-22

fix template tests

=== modified file 'config.yaml'
--- config.yaml	2018-08-31 18:29:22 +0000
+++ config.yaml	2019-05-22 17:28:46 +0000
@@ -209,10 +209,6 @@
         type: string
         default: ""
         description: Key for SAML cert for google, in base64
-    user:
-        default: ubunet
-        type: string
-        description: user to run under
     raven_dsn:
         type: string
         default: ""

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-12-01 17:52:16 +0000
+++ hooks/hooks.py	2019-05-22 17:28:46 +0000
@@ -70,4 +70,7 @@
 
 
 if __name__ == "__main__":
+    # workaround install.real script name
+    if 'install.real' in sys.argv[0]:
+        sys.argv[0] = sys.argv[0].replace('install.real', 'install')
     hooks.execute(sys.argv)

=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2019-05-22 17:28:46 +0000
@@ -0,0 +1,21 @@
+#!/bin/bash
+# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
+# by default.
+
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
+
+check_and_install() {
+    pkg="${1}-${2}"
+    if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
+        apt-get -y install ${pkg}
+    fi
+}
+
+PYTHON="python"
+
+for dep in ${DEPS[@]}; do
+    check_and_install ${PYTHON} ${dep}
+done
+
+exec ./hooks/install.real
+

=== renamed symlink 'hooks/install' => 'hooks/install.real'
=== modified file 'playbook.yaml'
--- playbook.yaml	2018-07-11 15:47:41 +0000
+++ playbook.yaml	2019-05-22 17:28:46 +0000
@@ -2,6 +2,7 @@
 - hosts: localhost
 
   vars:
+    user: "ubunet"
     hostdir: /srv/{{ hostname }}
     basedir: /srv/{{ hostname }}/{{ deployment }}
     code_dir: "{{ basedir }}/code"
@@ -10,13 +11,13 @@
     venv: "{{ current_dir }}/env"
     python: "{{ venv }}/bin/python"
     wheel_dir: "{{ current_dir }}/branches/wheels"
-    log_dir: "{{ basedir }}/logs"
-    sso_log: "{{ log_dir }}/sso.log"
+    logs_dir: "{{ basedir }}/logs"
+    sso_log: "{{ logs_dir }}/sso.log"
     oops_dir: "{{ basedir }}/logs/www-oops"
     conf_dir: "{{ basedir }}/etc"
     run_dir: "{{ basedir }}/run"
     bin_dir: "{{ basedir }}/bin"
-    migrate_log_dir: "{{ log_dir }}/schema-updates"
+    migrate_log_dir: "{{ logs_dir }}/schema-updates"
     db_readonly_path: "{{ run_dir }}"
     port: 8080
     conn_check_script: "{{ current_dir }}/scripts/settings-to-conncheck.py"
@@ -46,14 +47,14 @@
       when: relations['nrpe-external-master'] and 'nagios_host_context' in relations['nrpe-external-master'][0]
 
     - role: directories-and-permissions
-      user: "{{ user }}"
+      user: "ubunet"
       readonly_dirs:
         - "{{ code_dir }}"
         - "{{ archive_dir }}"
         - "{{ conf_dir }}"
         - "{{ bin_dir }}"
       writable_dirs:
-        - "{{ log_dir }}"
+        - "{{ logs_dir }}"
         - "{{ run_dir }}"
         - "{{ oops_dir }}"
         - "{{ migrate_log_dir }}"
@@ -72,7 +73,7 @@
       current_symlink: "{{ build_label }}"
       service_name: "{{ hostname }}"
       listen_port: "{{ port }}"
-      log_dir: "{{ log_dir }}"
+      log_dir: "{{ logs_dir }}"
       wsgi_user: "{{ user }}"
       wsgi_group: "{{ user }}"
       wsgi_application: django_project.wsgi
@@ -162,7 +163,7 @@
       tags:
           - config-changed
       file:
-        path: "{{ log_dir }}/sso.log"
+        path: "{{ logs_dir }}/sso.log"
         src: /var/log/upstart/gunicorn.log
         state: link
       # temporary when until migrated to talisker

=== modified file 'roles/directories-and-permissions/handlers/main.yaml'
--- roles/directories-and-permissions/handlers/main.yaml	2015-10-01 13:52:11 +0000
+++ roles/directories-and-permissions/handlers/main.yaml	2019-05-22 17:28:46 +0000
@@ -1,7 +1,9 @@
 # ansible file module's recursion seems broken
 - name: Ensure group ownership
   shell: chown -R :{{ user }} {{ item }}
-  with_items: readonly_dirs + writable_dirs
+  with_flattened:
+    - readonly_dirs
+    - writable_dirs
 
 - name: Ensure readonly group permissions
   shell: chmod -R g-w {{ item }}

=== modified file 'roles/directories-and-permissions/tasks/main.yaml'
--- roles/directories-and-permissions/tasks/main.yaml	2015-10-01 13:52:11 +0000
+++ roles/directories-and-permissions/tasks/main.yaml	2019-05-22 17:28:46 +0000
@@ -16,7 +16,9 @@
     - upgrade-charm
     - config-changed
   command: mkdir -p {{ item }}
-  with_items: readonly_dirs + writable_dirs 
+  with_flattened:
+    - readonly_dirs
+    - writable_dirs
 
 - name: Force permissions
   tags:

=== modified file 'roles/django/tasks/main.yaml'
--- roles/django/tasks/main.yaml	2018-02-26 15:51:30 +0000
+++ roles/django/tasks/main.yaml	2019-05-22 17:28:46 +0000
@@ -14,20 +14,20 @@
   when: has_syncdb|success
   tags: migrate
   command: "{{ python }} {{ manage }} syncdb --noinput"
-  environment: migrate_env
+  environment: "{{ migrate_env }}"
   args:
     chdir: "{{ src_dir }}"
 
 - name: run migrations
   tags: migrate
   command: "{{ python }} {{ manage }} migrate --noinput {%  if build_label == 'r1604' %}--fake-initial{% endif %}"
-  environment: migrate_env
+  environment: "{{ migrate_env }}"
   args:
     chdir: "{{ src_dir }}"
 
 - name: grant user
   tags: migrate
   command: "{{ python }} {{ manage }} grantuser {{ grant_user }}"
-  environment: migrate_env
+  environment: "{{ migrate_env }}"
   args:
     chdir: "{{ src_dir }}"

=== modified file 'templates/settings.py.j2'
--- templates/settings.py.j2	2018-08-31 18:29:22 +0000
+++ templates/settings.py.j2	2019-05-22 17:28:46 +0000
@@ -6,7 +6,7 @@
 import os
 
 os.environ['SSO_HOST_DIR'] = "{{ hostdir }}"
-os.environ.setdefault('SSO_LOGS_DIR', "{{ log_dir }}")
+os.environ.setdefault('SSO_LOGS_DIR', "{{ logs_dir }}")
 os.environ.setdefault('SSO_ROOT_URL', "https://{{ hostname }}")
 
 from django_project.settings_base import *

=== modified file 'unit_tests/test_templates.py'
--- unit_tests/test_templates.py	2017-10-10 16:11:43 +0000
+++ unit_tests/test_templates.py	2019-05-22 17:28:46 +0000
@@ -109,7 +109,7 @@
             "port": 8080,
             "hostdir": "/hostdir",
             "basedir": "/basedir",
-            "log_dir": "/logdir",
+            "logs_dir": "/logdir",
             "db_readonly_path": "/tmp",
             "google_saml_key_path": "/saml/key",
             "google_saml_cert_path": "/saml/cert",