Make sure OIDC provisions

Author: quartje

group_vars/vm.yml

@@ -402,7 +402,7 @@ authzadmin:
 # VM config for the authz-admin application
 ##
 authz_playground_version: 1.2
-authz_playground_snapshot_timestamp: "20160204.074458-4"
+#authz_playground_snapshot_timestamp: "20160208.150458-5"
 authz_playground_debug: true
 authzplayground:
   springapp_authz_client_id: cool_app_id
@@ -461,7 +461,7 @@ aa:
   rollbar_apiKey: "{{ aa_rollbar_apiKey }}"
 
 oidc_version: "1.0.1"
-oidc_snapshot_timestamp: "20160229.102842-1"
+#oidc_snapshot_timestamp: "20160229.102842-1"
 oidc:
   crt_name: "{{ tls_https.crt_name }}"
   key_name: "{{ tls_https.key_name }}"

provision-vm.yml

@@ -67,11 +67,12 @@
   vars:
     env_lang: java
   roles:
-    - tomcat
-    - java
+    - { role: tomcat,            tags: ['tomcat'] }
+    - { role: java,              tags: ['java'] }
     - { role: shibboleth,        tags: ['shib'   ] }
     - { role: metadata-exporter, tags: ['metadata-exporter'] }
     - { role: grouper,           tags: ['grouper'] }
+    - { role: oidc,              tags: ['oidc'] }
     - { role: teams,             tags: ['teams'  ] }
     - { role: mujina-idp,        tags: ['legacy' ] }
     - { role: mujina-sp,         tags: ['legacy' ] }
@@ -80,8 +81,15 @@
     - { role: voot,              tags: ['oauth', 'voot'            ] }
     - { role: authz-playground,  tags: ['oauth', 'authz-playground'] }
     - { role: pdp,               tags: ['pdp'] }
-    - { role: oidc,              tags: ['oidc'] }
     - { role: aa,                tags: ['aa'] }
   handlers:
     - include: roles/httpd/handlers/main.yml
     - include: roles/nginx/handlers/main.yml
+
+- hosts: java-apps
+  gather_facts: true
+  sudo: true
+  vars:
+    env_lang: java
+  roles:
+    - { role: vm_only_oidc,      tags: ['oidc'] }

roles/oidc/tasks/main.yml

@@ -6,14 +6,6 @@
   copy: src=resources dest={{ tomcat.install_dir }}/{{ tomcat.properties_dir }}/oidc owner=tomcat group=tomcat mode=0740
   register: oidc_language_files
 
-- name: copy default oidc client vm
-  copy: src=defaults.vm.sql dest=/tmp
-  when: env == 'vm'
-
-- name: insert default oidc client vm
-  mysql_db: name=oidc-server state=import target=/tmp/defaults.vm.sql
-  when: env == 'vm'
-
 - name: add language files to war
   shell: jar -uvf {{ tomcat_install_dir }}/wars/{{ deploy_name }}.war ./resources/ chdir={{ tomcat.install_dir }}/{{ tomcat.properties_dir }}/oidc
   sudo_user: tomcat
@@ -36,6 +28,8 @@
   copy: src=oidc-logback.xml dest={{ tomcat.install_dir }}/{{ tomcat.properties_dir }}/oidc-logback.xml group=tomcat owner=tomcat
   notify: restart tomcat
 
+- meta: flush_handlers
+
 - name: copy virtual host config
   template: src=oidc.conf.j2 dest=/etc/httpd/conf.d/oidc.conf
   notify: reload httpd

roles/oidc/files/defaults.vm.sql roles/vm_only_oidc/files/defaults.vm.sqlroles/oidc/files/defaults.vm.sql renamed to roles/vm_only_oidc/files/defaults.vm.sql

@@ -0,0 +1,8 @@
+---
+- name: copy default oidc client vm
+  copy: src=defaults.vm.sql dest=/tmp
+  when: env == 'vm'
+
+- name: insert default oidc client vm
+  mysql_db: name=oidc-server state=import target=/tmp/defaults.vm.sql
+  when: env == 'vm'