Skip to content

Commit

Permalink
Zuul01 (#63)
Browse files Browse the repository at this point in the history
Zuul01

Reviewed-by: None <None>
Reviewed-by: Tim Beermann <tibeer@outlook.de>
  • Loading branch information
osfrickler committed Mar 21, 2022
1 parent 1b1525a commit ed2b2ff
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 5 deletions.
10 changes: 10 additions & 0 deletions .zuul.yaml
@@ -0,0 +1,10 @@
---
- project:
default-branch: main
merge-mode: squash-merge
check:
jobs:
- tox-linters
gate:
jobs:
- tox-linters
8 changes: 4 additions & 4 deletions all/001-kolla-defaults.yml
Expand Up @@ -755,12 +755,12 @@ enable_destroy_images: "no"
####################
# Monasca options
####################
monasca_enable_alerting_pipeline: True
monasca_enable_alerting_pipeline: true

# Send logs from the control plane to the Monasca API. Monasca will then persist
# them in Elasticsearch. If this is disabled, control plane logs will be sent
# directly to Elasticsearch.
monasca_ingest_control_plane_logs: True
monasca_ingest_control_plane_logs: true

monasca_api_admin_base_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_api_port }}"
monasca_api_internal_base_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_api_port }}"
Expand Down Expand Up @@ -1052,7 +1052,7 @@ murano_agent_rabbitmq_user: "muranoagent"
# Horizon options
#######################
horizon_backend_database: "{{ enable_murano | bool }}"
horizon_keystone_multidomain: False
horizon_keystone_multidomain: false

# Enable deploying custom horizon policy files for services that don't have a
# horizon plugin but have a policy file. Override these when you have services
Expand Down Expand Up @@ -1221,7 +1221,7 @@ swift_public_endpoint: "{{ public_protocol }}://{{ swift_external_fqdn | put_add
# Whether to run Kolla-Ansible's automatic configuration for Octavia.
# NOTE: if you upgrade from Ussuri, you must set `octavia_auto_configure` to `no`
# and keep your other Octavia config like before.
octavia_auto_configure: yes
octavia_auto_configure: "yes"

# Octavia network type options are [ tenant, provider ]
# * tenant indicates that we will create a tenant network and a network
Expand Down
2 changes: 1 addition & 1 deletion all/002-images-kolla.yml
Expand Up @@ -289,7 +289,7 @@ rabbitmq_tag: "{{ kolla_rabbitmq_version|default(kolla_image_version) }}"
# role: nova-cell

nova_libvirt_image: "{{ docker_registry }}/{{ docker_namespace }}/nova-libvirt"
nova_libvirt_tag: {{ kolla_nova_libvirt_version|default(kolla_image_version) }}"
nova_libvirt_tag: "{{ kolla_nova_libvirt_version|default(kolla_image_version) }}"
nova_ssh_image: "{{ docker_registry }}/{{ docker_namespace }}/nova-ssh"
nova_ssh_tag: "{{ nova_tag }}"
nova_novncproxy_image: "{{ docker_registry }}/{{ docker_namespace }}/nova-novncproxy"
Expand Down
13 changes: 13 additions & 0 deletions tox.ini
@@ -0,0 +1,13 @@
[tox]
minversion = 3.18.0
skipsdist = True

[testenv]
usedevelop = False
basepython = python3

[testenv:linters]
deps =
yamllint
commands =
yamllint -s .

0 comments on commit ed2b2ff

Please sign in to comment.