diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f68b592147e6ea593651710794e12240013cb7e..6bd21f2f39ab68f93996d5bdc93f23198b1a0432 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 2024-03-22 + +* Remove netcapture miris api configuration, api key is now generated by `ubicast-netcapture` package + # 2024-02-16 * Rework roles in 3 distinct stages. Stages can be used with the ansible tags of the same name. diff --git a/inventories/example/ha/host_vars/ha-misc1.yml b/inventories/example/ha/host_vars/ha-misc1.yml index c8f184eb5276e43e431e28b782770dcb758b4879..e09039db17c9fcc20ed1df75272dbb9da169be70 100644 --- a/inventories/example/ha/host_vars/ha-misc1.yml +++ b/inventories/example/ha/host_vars/ha-misc1.yml @@ -28,14 +28,6 @@ cache_domain: "cache.ubica.st" # Folder used to store the medias #netcapture_media_folder: "/data/netcapture/media" -# netcapture: -# Activates the authentication for the deployed netcapture miris API -#netcapture_miris_auth: True - -# netcapture: -# Password of the deployed netcapture miris API -netcapture_miris_user_pwd: "my-password" - # netcapture: # Activates the SSL verification when calling the Nudgis Manager #netcapture_mm_ssl: True @@ -131,4 +123,4 @@ tester_tests_ignored: # From fields for email sending (as defined in RFC2822) #vault_email_from: "{{ ansible_fqdn }} <backup@{{ ansible_fqdn }}>" -... \ No newline at end of file +... diff --git a/inventories/example/std/host_vars/std-misc1.yml b/inventories/example/std/host_vars/std-misc1.yml index 449ba5715b3ea1b1c4aeca597a550c248874c593..0bf2e8ebcba8e66ff70f30fbb043f5c9084c7216 100644 --- a/inventories/example/std/host_vars/std-misc1.yml +++ b/inventories/example/std/host_vars/std-misc1.yml @@ -28,14 +28,6 @@ cache_domain: "cache.ubica.st" # Folder used to store the medias #netcapture_media_folder: "/data/netcapture/media" -# netcapture: -# Activates the authentication for the deployed netcapture miris API -#netcapture_miris_auth: True - -# netcapture: -# Password of the deployed netcapture miris API -netcapture_miris_user_pwd: "my-password" - # netcapture: # Activates the SSL verification when calling the Nudgis Manager #netcapture_mm_ssl: True @@ -127,4 +119,4 @@ sysuser_ubicast_password: "my-password" tester_tests_ignored: - uptime.sh -... \ No newline at end of file +... diff --git a/roles/netcapture/README.md b/roles/netcapture/README.md index e220c492d330c02905e909463fafed2761f6fb29..741d0111fed5500e44fc763641637f65e1ecd770 100644 --- a/roles/netcapture/README.md +++ b/roles/netcapture/README.md @@ -7,11 +7,6 @@ The netcapture group is used to configure the server which will host UbiCast vir Available variables are listed below, along with the descriptions and the default values. -`netcapture_miris_user_pwd`: Password of the deployed netcapture miris API -``` -netcapture_miris_user_pwd: "changeme" -``` - `netcapture_mm_url`: URL of the mirismanager to use for packages ``` netcapture_mm_url: "mirismanager.example.com" diff --git a/roles/netcapture/defaults/main.yml b/roles/netcapture/defaults/main.yml index 4ad3190fe9d7fa268d02851c2322c0fa6e8018d5..99fa7be0038350194cbc1df194e98db44ec6ce14 100644 --- a/roles/netcapture/defaults/main.yml +++ b/roles/netcapture/defaults/main.yml @@ -1,8 +1,5 @@ --- -# Password of the deployed netcapture miris API -netcapture_miris_user_pwd: "changeme" - # URL of the mirismanager to use for packages netcapture_mm_url: "mirismanager.example.com" diff --git a/roles/netcapture/tasks/configure.yml b/roles/netcapture/tasks/configure.yml index 81bf3a24cb27f8c75312b9e1d95a25bb405abee7..4abd6f7e69542ece4e3ef6fec96dce31a9de1e5c 100644 --- a/roles/netcapture/tasks/configure.yml +++ b/roles/netcapture/tasks/configure.yml @@ -6,9 +6,4 @@ - netcapture_mm_url is defined - netcapture_mm_ssl is defined -- name: MIRIS API CONFIGURATION FILE - ansible.builtin.include_tasks: "configure/miris-configure.yml" - when: - - netcapture_miris_user_pwd is defined - ... diff --git a/roles/netcapture/tasks/configure/miris-configure.yml b/roles/netcapture/tasks/configure/miris-configure.yml deleted file mode 100644 index 11ef62791ab7997af59fb8d41691130d422f99f4..0000000000000000000000000000000000000000 --- a/roles/netcapture/tasks/configure/miris-configure.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- - -- name: check if miris api config exists - ansible.builtin.stat: - path: "{{ netcapture_conf_folder }}/api.json" - register: miris_config_file - -- name: create netcapture miris api config - ansible.builtin.template: - src: miris-api.json.j2 - dest: "{{ netcapture_conf_folder }}/api.json" - mode: u=rw,g=r,o=r - when: not miris_config_file.stat.exists - -... diff --git a/roles/netcapture/templates/miris-api.json.j2 b/roles/netcapture/templates/miris-api.json.j2 deleted file mode 100644 index 0f00edfaeb72a80887738f4a8f29cfadc9047c0f..0000000000000000000000000000000000000000 --- a/roles/netcapture/templates/miris-api.json.j2 +++ /dev/null @@ -1,4 +0,0 @@ -{ - "auth_user_password": "{{ netcapture_miris_user_pwd }}", - "auth_enable": {% if netcapture_miris_auth %}true{% else %}false{% endif %} -} diff --git a/roles/netcapture/vars/main.yml b/roles/netcapture/vars/main.yml index 11c1cf67c8e391f49f6db23665e61a650093739c..c604e639f8beef1e930257db576023ee8dafbcf1 100644 --- a/roles/netcapture/vars/main.yml +++ b/roles/netcapture/vars/main.yml @@ -9,7 +9,4 @@ netcapture_conf_folder: "/etc/miris/conf" # Folder used to store the medias netcapture_media_folder: "/data/netcapture/media" -# Activates the authentication for the deployed netcapture miris API -netcapture_miris_auth: True - ...