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

[Guillermo Gonzalez]

Add bionic support: fix playbook and update series in metadata.yaml

[Maximiliano Bertacchini (maxiberta)]

+1

review: Approve

[Guillermo Gonzalez (verterok)]

So, I went ahead and used this patch in my scratch1 deployment, of course it was not enough to get it working.

Bionic ships with Ansible 2.5, and obvously it breaks a couple of things that works on Xenial. The problem is that the fixes/ported tasks are not compatible with the ansible version in Xenial...

So, we need to do a forced upgrade to bionic...which is not trivial given this is not a switch-deploy, etc.

something to discuss with management.

[lp:~verterok/canonical-identity-provider/bionic-support]

98. By Guillermo Gonzalez on 2021-07-26

fix roles and playbook to work on ansible 2.5 (bionic version)

99. By Guillermo Gonzalez on 2021-07-26

fix directories-and-permissions role

[Guillermo Gonzalez (verterok)]

pushed all the changes to make it work on bionic, but also dependencies need to be updated.
will put this on the shelve and continue with the PS5 porting

Unmerged revisions

99. By Guillermo Gonzalez on 2021-07-26

fix directories-and-permissions role

98. By Guillermo Gonzalez on 2021-07-26

fix roles and playbook to work on ansible 2.5 (bionic version)

97. By Guillermo Gonzalez on 2021-07-26

fix playbook to work on bionic, and add it to the list of series

=== modified file 'metadata.yaml'
--- metadata.yaml	2019-08-15 18:48:30 +0000
+++ metadata.yaml	2021-07-26 19:20:02 +0000
@@ -3,6 +3,7 @@
 maintainer: Simon Davy <[e-mail]>
 series:
   - xenial
+  - bionic
 description: ""
 categories:
   - authentication

=== modified file 'playbook.yaml'
--- playbook.yaml	2021-06-23 14:38:23 +0000
+++ playbook.yaml	2021-07-26 19:20:02 +0000
@@ -119,8 +119,7 @@
         - upgrade-charm
       pip:
         executable: pip2
-        chdir: "{{ charm_dir }}"
-        name: lib/virtualenv-tools
+        name: "{{ charm_dir }}/lib/virtualenv-tools"
         extra_args: "--upgrade --no-index"
 
     - name: check postfix relayhost
@@ -296,7 +295,7 @@
         relation-set -r {{ item.__relid__ }}
         hostname={{ local_unit.split('/')[0] }}
         port={{ port }}
-      with_items: relations.website
+      loop: "{{ relations.website|flatten(levels=1) }}"
 
     - name: write conn-check config
       tags:
@@ -311,7 +310,7 @@
       environment:
           PYTHONPATH: ".:lib:{{ conf_dir }}"
           DJANGO_SETTINGS_MODULE: "{{ DJANGO_SETTINGS_MODULE }}"
-      with_items: relations['conn-check']
+      loop: "{{ relations['conn-check']|flatten(levels=1) }}"
       when: build_label != "" and payload.stat.exists
 
     - name: Write rsyslog logrotate configuration

=== modified file 'roles/directories-and-permissions/tasks/main.yaml'
--- roles/directories-and-permissions/tasks/main.yaml	2019-04-18 20:09:21 +0000
+++ roles/directories-and-permissions/tasks/main.yaml	2021-07-26 19:20:02 +0000
@@ -16,9 +16,7 @@
     - upgrade-charm
     - config-changed
   command: mkdir -p {{ item }}
-  with_flattened:
-    - readonly_dirs
-    - writable_dirs
+  loop: "{{ readonly_dirs|zip(writable_dirs)|list }}"
 
 - name: Force permissions
   tags:

=== modified file 'roles/nrpe-external-master/handlers/main.yml'
--- roles/nrpe-external-master/handlers/main.yml	2014-08-19 16:36:07 +0000
+++ roles/nrpe-external-master/handlers/main.yml	2021-07-26 19:20:02 +0000
@@ -3,4 +3,4 @@
     relation-set -r {{ item.__relid__ }}
     timestamp={{ ansible_date_time.iso8601_micro }}
   when: relations['nrpe-external-master']
-  with_items: relations['nrpe-external-master']
+  loop: "{{ relations['nrpe-external-master']|flatten(levels=1) }}"

=== modified file 'roles/nrpe-external-master/tasks/main.yaml'
--- roles/nrpe-external-master/tasks/main.yaml	2015-07-22 10:24:10 +0000
+++ roles/nrpe-external-master/tasks/main.yaml	2021-07-26 19:20:02 +0000
@@ -9,7 +9,7 @@
     group: nagios
     mode: 0644
   when: relations['nrpe-external-master']
-  with_items: checks
+  loop: "{{ checks|flatten(levels=1) }}"
   notify:
     - nrpe config changes
 
@@ -25,6 +25,6 @@
     group: nagios
     mode: 0644
   when: relations['nrpe-external-master']
-  with_items: checks
+  loop: "{{ checks|flatten(levels=1) }}"
   notify:
     - nrpe config changes