diff --git a/.gitignore b/.gitignore index 3a77206..fe6585a 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ logs/* .tox *.egg-info .eggs +.ansible # Generated by pbr while building docs ###################################### diff --git a/defaults/main.yml b/defaults/main.yml index c3cb450..112451e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -14,7 +14,7 @@ # limitations under the License. ## Verbosity Options -debug: False +debug: false # Enable/Disable Ceilometer designate_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" @@ -237,7 +237,6 @@ designate_mdns_init_overrides: {} designate_sink_init_overrides: {} designate_api_init_overrides: {} - ## Service Name-Group Mapping designate_services: designate-central: @@ -301,7 +300,7 @@ designate_pki_setup_host: "{{ openstack_pki_setup_host | default('localhost') }} designate_pki_keys_path: "{{ designate_pki_dir ~ '/certs/private/' }}" designate_pki_certs_path: "{{ designate_pki_dir ~ '/certs/certs/' }}" designate_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('ExampleCorpIntermediate') }}" -designate_pki_regen_cert: '' +designate_pki_regen_cert: "" designate_pki_san: "{{ openstack_pki_san | default('DNS:' ~ ansible_facts['hostname'] ~ ',IP:' ~ management_address) }}" designate_pki_certificates: - name: "designate_{{ ansible_facts['hostname'] }}" diff --git a/handlers/main.yml b/handlers/main.yml index 6fad991..d572c6b 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -31,7 +31,7 @@ - name: Perform Designate pools update command: "{{ designate_bin }}/designate-manage pool update --file /etc/designate/pools.yaml" - become: yes + become: true become_user: "{{ designate_system_user_name }}" changed_when: false when: designate_pools_yaml is defined diff --git a/tasks/designate_db_sync.yml b/tasks/designate_db_sync.yml index 61f0122..5dbe0eb 100644 --- a/tasks/designate_db_sync.yml +++ b/tasks/designate_db_sync.yml @@ -15,6 +15,6 @@ - name: Perform a Designate DB sync command: "{{ designate_bin }}/designate-manage database sync" - become: yes + become: true become_user: "{{ designate_system_user_name }}" changed_when: false diff --git a/vars/distro_install.yml b/vars/distro_install.yml index c4291e8..0d0d113 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -15,12 +15,12 @@ # designate_package_list: |- - {% set packages = designate_distro_packages %} - {% set _ = packages.extend(designate_service_distro_packages) %} - {% if designate_rndc_keys is defined %} - {% set _ = packages.extend(designate_rndc_packages) %} - {% endif %} - {{ packages }} + {% set packages = designate_distro_packages %} + {% set _ = packages.extend(designate_service_distro_packages) %} + {% if designate_rndc_keys is defined %} + {% set _ = packages.extend(designate_rndc_packages) %} + {% endif %} + {{ packages }} _designate_bin: "/usr/bin" _designate_etc: "/etc" diff --git a/vars/source_install.yml b/vars/source_install.yml index 0243a50..925d21e 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -15,11 +15,11 @@ # designate_package_list: |- - {% set packages = designate_distro_packages %} - {% if designate_rndc_keys is defined %} - {% set _ = packages.extend(designate_rndc_packages) %} - {% endif %} - {{ packages }} + {% set packages = designate_distro_packages %} + {% if designate_rndc_keys is defined %} + {% set _ = packages.extend(designate_rndc_packages) %} + {% endif %} + {{ packages }} _designate_bin: "/openstack/venvs/designate-{{ designate_venv_tag }}/bin" _designate_etc: "{{ _designate_bin | dirname + '/etc' }}"