diff --git a/.gitignore b/.gitignore index 3a77206..c46a9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ logs/* # OS generated files # ###################### ._* +.ansible .tox *.egg-info .eggs diff --git a/defaults/main.yml b/defaults/main.yml index 77db875..7208888 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,3 +1,4 @@ +--- # Copyright 2019, VEXXHOST, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -135,7 +136,7 @@ placement_services: service_name: placement-api init_config_overrides: "{{ placement_api_init_overrides }}" start_order: 1 - wsgi_app: True + wsgi_app: true wsgi_name: placement-api uwsgi_overrides: "{{ placement_api_uwsgi_ini_overrides }}" uwsgi_bind_address: "{{ placement_bind_address }}" @@ -166,7 +167,7 @@ placement_pki_setup_host: "{{ openstack_pki_setup_host | default('localhost') }} placement_pki_keys_path: "{{ placement_pki_dir ~ '/certs/private/' }}" placement_pki_certs_path: "{{ placement_pki_dir ~ '/certs/certs/' }}" placement_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('ExampleCorpIntermediate') }}" -placement_pki_regen_cert: '' +placement_pki_regen_cert: "" placement_pki_san: "{{ openstack_pki_san | default('DNS:' ~ ansible_facts['hostname'] ~ ',IP:' ~ management_address) }}" placement_pki_certificates: - name: "placement_{{ ansible_facts['hostname'] }}" diff --git a/handlers/main.yml b/handlers/main.yml index 7979c7a..e78ccf7 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -12,14 +12,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - - name: Stop services service: name: "{{ item.service_name }}" - enabled: yes + enabled: true state: "stopped" - daemon_reload: yes + daemon_reload: true with_items: "{{ filtered_placement_services }}" register: _stop until: _stop is success @@ -34,9 +32,9 @@ - name: Start services service: name: "{{ item.service_name }}" - enabled: yes + enabled: true state: "started" - daemon_reload: yes + daemon_reload: true with_items: "{{ filtered_placement_services }}" register: _start until: _start is success diff --git a/tasks/placement_db_post_setup.yml b/tasks/placement_db_post_setup.yml index eba25f4..2e56c09 100644 --- a/tasks/placement_db_post_setup.yml +++ b/tasks/placement_db_post_setup.yml @@ -37,7 +37,7 @@ dest: "/etc/ansible/facts.d/openstack_ansible.fact" section: placement option: need_online_data_migrations - value: False + value: false mode: "0644" with_items: "{{ groups[placement_services['placement-api']['group']] }}" when: diff --git a/tasks/placement_db_sync.yml b/tasks/placement_db_sync.yml index 55e1220..58e4db6 100644 --- a/tasks/placement_db_sync.yml +++ b/tasks/placement_db_sync.yml @@ -15,6 +15,6 @@ - name: Perform a Placement DB sync command: "{{ placement_bin }}/placement-manage db sync" - become: yes + become: true become_user: "{{ placement_system_user_name }}" changed_when: false diff --git a/tasks/placement_install.yml b/tasks/placement_install.yml index 9cf8cdc..9fca4d9 100644 --- a/tasks/placement_install.yml +++ b/tasks/placement_install.yml @@ -51,7 +51,7 @@ venv_facts_when_changed: - section: "placement" option: "need_online_data_migrations" - value: True + value: true - section: "placement" option: "venv_tag" value: "{{ placement_venv_tag }}" @@ -82,7 +82,7 @@ systemd_service_tasks_accounting: true systemd_services: - service_name: "{{ service_var.service_name }}" - enabled: yes + enabled: true state: started execstarts: "{{ service_var.execstarts }}" execreloads: "{{ service_var.execreloads | default([]) }}" diff --git a/vars/debian.yml b/vars/debian.yml index beab342..1574255 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -12,8 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - ## APT Cache options cache_timeout: 600