diff --git a/.gitignore b/.gitignore index 3a772066..c46a9ec6 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 4e23bcba..66d3c506 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -14,7 +14,7 @@ # limitations under the License. ## Verbosity Options -debug: False +debug: false # python venv executable magnum_venv_python_executable: "{{ openstack_venv_python_executable | default('python3') }}" @@ -164,7 +164,7 @@ magnum_trustee_domain_admin_name: trustee_domain_admin magnum_trustee_domain_name: magnum magnum_trustee_domain_admin_roles: - admin -magnum_cluster_user_trust: True +magnum_cluster_user_trust: true # Glance images ## Example Glance Image - Fedora CoreOS @@ -240,7 +240,7 @@ magnum_services: service_name: magnum-api init_config_overrides: "{{ magnum_api_init_config_overrides }}" start_order: 2 - wsgi_app: True + wsgi_app: true wsgi_path: "{{ magnum_bin }}/magnum-api-wsgi" uwsgi_overrides: "{{ magnum_api_uwsgi_ini_overrides }}" uwsgi_port: "{{ magnum_bind_port }}" @@ -281,7 +281,7 @@ magnum_pki_setup_host: "{{ openstack_pki_setup_host | default('localhost') }}" magnum_pki_keys_path: "{{ magnum_pki_dir ~ '/certs/private/' }}" magnum_pki_certs_path: "{{ magnum_pki_dir ~ '/certs/certs/' }}" magnum_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('ExampleCorpIntermediate') }}" -magnum_pki_regen_cert: '' +magnum_pki_regen_cert: "" magnum_pki_san: "{{ openstack_pki_san | default('DNS:' ~ ansible_facts['hostname'] ~ ',IP:' ~ management_address) }}" magnum_pki_certificates: - name: "magnum_{{ ansible_facts['hostname'] }}" diff --git a/handlers/main.yml b/handlers/main.yml index 3027fedf..890fd7a0 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -17,9 +17,9 @@ - name: Restart magnum services systemd: name: "{{ item.service_name }}" - enabled: yes + enabled: true state: "restarted" - daemon_reload: yes + daemon_reload: true with_items: "{{ filtered_magnum_services }}" listen: - "venv changed" diff --git a/tasks/magnum_db_sync.yml b/tasks/magnum_db_sync.yml index 8aa06409..a03f24ed 100644 --- a/tasks/magnum_db_sync.yml +++ b/tasks/magnum_db_sync.yml @@ -15,6 +15,6 @@ - name: Perform a synchronization of the Magnum database command: "{{ magnum_bin }}/magnum-db-manage upgrade" - become: yes + become: true become_user: "{{ magnum_system_user_name }}" changed_when: false diff --git a/tasks/magnum_service_setup.yml b/tasks/magnum_service_setup.yml index c9abc4b4..579b9cfd 100644 --- a/tasks/magnum_service_setup.yml +++ b/tasks/magnum_service_setup.yml @@ -41,7 +41,7 @@ - name: "{{ magnum_trustee_domain_admin_name }}" password: "{{ magnum_trustee_password }}" domain: "{{ magnum_trustee_domain_name }}" - project: '' + project: "" role: "{{ magnum_trustee_domain_admin_roles }}" _service_endpoints: - service: "{{ magnum_service_name }}" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 6290e3c4..3fa62a18 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,10 +1,11 @@ +--- - job: # test a full deployment of openstack, k8s control plane, octavia, magnum+magnum_cluster_api name: openstack-ansible-deploy-aio_magnum_octavia_capi_kvm-base parent: openstack-ansible-deploy-aio nodeset: osa-ubuntu-jammy-32GB vars: - osa_pre_run_bootstrap: False + osa_pre_run_bootstrap: false required-projects: - name: openstack/openstack-ansible-ops pre-run: @@ -27,7 +28,7 @@ name: openstack-ansible-deploy-hosts_lxc_k8s-base parent: openstack-ansible-deploy-aio-hosts vars: - osa_pre_run_bootstrap: False + osa_pre_run_bootstrap: false required-projects: - name: openstack/openstack-ansible-ops pre-run: diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 47b045a0..df92e9df 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -1,3 +1,4 @@ +--- - nodeset: name: osa-ubuntu-jammy-32GB nodes: diff --git a/zuul.d/playbooks/bootstrap-mcapi-k8s.yml b/zuul.d/playbooks/bootstrap-mcapi-k8s.yml index 6fc71639..fcd2a231 100644 --- a/zuul.d/playbooks/bootstrap-mcapi-k8s.yml +++ b/zuul.d/playbooks/bootstrap-mcapi-k8s.yml @@ -15,19 +15,19 @@ - name: Bootstrap configuration for Vexxhost magnum-cluster-api driver hosts: all - become: yes + become: true become_user: root tasks: - name: Copy configuration files into place ansible.builtin.copy: src: "{{ ansible_user_dir }}/src/opendev.org/openstack/openstack-ansible-ops/mcapi_vexxhost/playbooks/files/openstack_deploy" - dest: '/etc/' + dest: "/etc/" remote_src: true - name: Copy h/a k8s specific configuration files into place ansible.builtin.copy: src: "{{ ansible_user_dir }}/src/opendev.org/openstack/openstack-ansible-ops/mcapi_vexxhost/playbooks/files/k8s-ha/" - dest: '/etc/openstack_deploy' + dest: "/etc/openstack_deploy" remote_src: true - name: Add extra config to user variables diff --git a/zuul.d/playbooks/bootstrap-mcapi-vexxhost.yml b/zuul.d/playbooks/bootstrap-mcapi-vexxhost.yml index 2edb1cde..e9b5b98d 100644 --- a/zuul.d/playbooks/bootstrap-mcapi-vexxhost.yml +++ b/zuul.d/playbooks/bootstrap-mcapi-vexxhost.yml @@ -15,13 +15,13 @@ - name: Bootstrap configuration for Vexxhost magnum-cluster-api driver hosts: all - become: yes + become: true become_user: root tasks: - name: Copy configuration files into place ansible.builtin.copy: src: "{{ ansible_user_dir }}/src/opendev.org/openstack/openstack-ansible-ops/mcapi_vexxhost/playbooks/files/openstack_deploy" - dest: '/etc/' + dest: "/etc/" remote_src: true - name: Add extra config to user variables