diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml index 14ac9145c..446f46e6b 100644 --- a/ansible/roles/cloudkitty/defaults/main.yml +++ b/ansible/roles/cloudkitty/defaults/main.yml @@ -141,7 +141,7 @@ cloudkitty_storage_backend: "influxdb" # cloudkitty_influxdb_retention_policy: "autogen" # Set to true to use SSL for InfluxDB connections. -# cloudkitty_influxdb_use_ssl: false +cloudkitty_influxdb_use_ssl: true # Path of the CA certificate to trust for HTTPS connections. # cloudkitty_influxdb_cafile: "{{ openstack_cacert }}" diff --git a/ansible/roles/cloudkitty/tasks/bootstrap.yml b/ansible/roles/cloudkitty/tasks/bootstrap.yml index 2ba290656..05a9a00aa 100644 --- a/ansible/roles/cloudkitty/tasks/bootstrap.yml +++ b/ansible/roles/cloudkitty/tasks/bootstrap.yml @@ -41,6 +41,7 @@ hostname: "{{ influxdb_address }}" port: "{{ influxdb_http_port }}" database_name: "{{ cloudkitty_influxdb_name }}" + ssl: yes run_once: True delegate_to: "{{ groups['cloudkitty-api'][0] }}" when: cloudkitty_storage_backend == 'influxdb' diff --git a/ansible/roles/monasca/tasks/bootstrap.yml b/ansible/roles/monasca/tasks/bootstrap.yml index 0ae726e0f..f8b905cce 100644 --- a/ansible/roles/monasca/tasks/bootstrap.yml +++ b/ansible/roles/monasca/tasks/bootstrap.yml @@ -44,7 +44,7 @@ # [1] https://github.com/influxdata/influxdb-python#influxdb-pre-v110-users - name: List influxdb databases become: true - command: "docker exec influxdb influx -host {{ monasca_influxdb_address }} -port {{ monasca_influxdb_http_port }} -execute 'show databases'" + command: "docker exec influxdb influx -ssl -host {{ monasca_influxdb_address }} -port {{ monasca_influxdb_http_port }} -execute 'show databases'" run_once: True delegate_to: "{{ groups['influxdb'][0] }}" register: monasca_influxdb_database @@ -53,7 +53,7 @@ - name: Creating monasca influxdb database become: true command: > - docker exec influxdb influx -host {{ monasca_influxdb_address }} -port {{ monasca_influxdb_http_port }} -execute + docker exec influxdb influx -ssl -host {{ monasca_influxdb_address }} -port {{ monasca_influxdb_http_port }} -execute 'CREATE DATABASE {{ monasca_influxdb_name }} WITH DURATION {{ monasca_influxdb_retention_policy.duration }} REPLICATION {{ monasca_influxdb_retention_policy.replication_count }} NAME {{ monasca_influxdb_retention_policy.name }}' run_once: True diff --git a/ansible/roles/watcher/tasks/config.yml b/ansible/roles/watcher/tasks/config.yml index a634d03db..2b1688a09 100644 --- a/ansible/roles/watcher/tasks/config.yml +++ b/ansible/roles/watcher/tasks/config.yml @@ -40,6 +40,7 @@ src: "{{ item.key }}.json.j2" dest: "{{ node_config_directory }}/{{ item.key }}/config.json" mode: "0660" + become: true when: - inventory_hostname in groups[item.value.group] - item.value.enabled | bool @@ -59,6 +60,7 @@ - "{{ node_custom_config }}/watcher/{{ inventory_hostname }}/watcher.conf" dest: "{{ node_config_directory }}/{{ item.key }}/watcher.conf" mode: "0660" + become: true when: - inventory_hostname in groups[item.value.group] - item.value.enabled | bool @@ -71,6 +73,7 @@ src: "{{ watcher_policy_file_path }}" dest: "{{ node_config_directory }}/{{ item.key }}/{{ watcher_policy_file }}" mode: "0660" + become: true when: - watcher_policy_file is defined - inventory_hostname in groups[item.value.group]