Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 0 additions & 77 deletions all/002-images-kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ heat_api_cfn_tag: "{{ heat_tag }}"
heat_engine_image: "{{ docker_image_url }}heat-engine"
heat_engine_tag: "{{ heat_tag }}"

##############################
# role: murano

murano_tag: "{{ kolla_murano_version|default(kolla_image_version) }}"
murano_api_image: "{{ docker_image_url }}murano-api"
murano_api_tag: "{{ murano_tag }}"
murano_engine_image: "{{ docker_image_url }}murano-engine"
murano_engine_tag: "{{ murano_tag }}"

##############################
# role: manila

Expand Down Expand Up @@ -154,32 +145,6 @@ masakari_engine_tag: "{{ masakari_tag }}"
masakari_monitors_image: "{{ docker_image_url }}masakari-monitors"
masakari_monitors_tag: "{{ masakari_tag }}"

##############################
# role: solum

solum_tag: "{{ kolla_solum_version|default(kolla_image_version) }}"
solum_worker_image: "{{ docker_image_url }}solum-worker"
solum_worker_tag: "{{ solum_tag }}"
solum_deployer_image: "{{ docker_image_url }}solum-deployer"
solum_deployer_tag: "{{ solum_tag }}"
solum_conductor_image: "{{ docker_image_url }}solum-conductor"
solum_conductor_tag: "{{ solum_tag }}"
solum_api_image: "{{ docker_image_url }}solum-api"
solum_api_tag: "{{ solum_tag }}"

##############################
# role: senlin

senlin_tag: "{{ kolla_senlin_version|default(kolla_image_version) }}"
senlin_conductor_image: "{{ docker_image_url }}senlin-conductor"
senlin_conductor_tag: "{{ senlin_tag }}"
senlin_engine_image: "{{ docker_image_url }}senlin-engine"
senlin_engine_tag: "{{ senlin_tag }}"
senlin_health_manager_image: "{{ docker_image_url }}senlin-health-manager"
senlin_health_manager_tag: "{{ senlin_tag }}"
senlin_api_image: "{{ docker_image_url }}senlin-api"
senlin_api_tag: "{{ senlin_tag }}"

##############################
# role: keystone

Expand All @@ -193,21 +158,6 @@ keystone_ssh_tag: "{{ keystone_tag }}"
keystone_httpd_image: "{{ docker_image_url }}httpd"
keystone_httpd_tag: "{{ keystone_tag }}"

##############################
# role: vitrage

vitrage_tag: "{{ kolla_vitrage_version|default(kolla_image_version) }}"
vitrage_graph_image: "{{ docker_image_url }}vitrage-graph"
vitrage_graph_tag: "{{ vitrage_tag }}"
vitrage_api_image: "{{ docker_image_url }}vitrage-api"
vitrage_api_tag: "{{ vitrage_tag }}"
vitrage_notifier_image: "{{ docker_image_url }}vitrage-notifier"
vitrage_notifier_tag: "{{ vitrage_tag }}"
vitrage_ml_image: "{{ docker_image_url }}vitrage-ml"
vitrage_ml_tag: "{{ vitrage_tag }}"
vitrage_persistor_image: "{{ docker_image_url }}vitrage-persistor"
vitrage_persistor_tag: "{{ vitrage_tag }}"

##############################
# role: vmtp

Expand Down Expand Up @@ -252,15 +202,6 @@ cinder_backup_tag: "{{ cinder_tag }}"
cinder_api_image: "{{ docker_image_url }}cinder-api"
cinder_api_tag: "{{ cinder_tag }}"

##############################
# role: freezer

freezer_tag: "{{ kolla_freezer_version|default(kolla_image_version) }}"
freezer_api_image: "{{ docker_image_url }}freezer-api"
freezer_api_tag: "{{ freezer_tag }}"
freezer_scheduler_image: "{{ docker_image_url }}freezer-scheduler"
freezer_scheduler_tag: "{{ freezer_tag }}"

##############################
# role: kibana

Expand Down Expand Up @@ -324,15 +265,6 @@ magnum_api_tag: "{{ magnum_tag }}"
magnum_conductor_image: "{{ docker_image_url }}magnum-conductor"
magnum_conductor_tag: "{{ magnum_tag }}"

##############################
# role: sahara

sahara_tag: "{{ kolla_sahara_version|default(kolla_image_version) }}"
sahara_engine_image: "{{ docker_image_url }}sahara-engine"
sahara_engine_tag: "{{ sahara_tag }}"
sahara_api_image: "{{ docker_image_url }}sahara-api"
sahara_api_tag: "{{ sahara_tag }}"

##############################
# role: loadbalancer

Expand Down Expand Up @@ -706,15 +638,6 @@ ironic_dnsmasq_tag: "{{ kolla_dnsmasq_version|default(kolla_image_version) }}"
ironic_prometheus_exporter_image: "{{ docker_image_url }}ironic-prometheus-exporter"
ironic_prometheus_exporter_tag: "{{ kolla_ironic_prometheus_exporter_version|default(kolla_image_version) }}"

##############################
# role: skydive

skydive_tag: "{{ kolla_skydive_version|default(kolla_image_version) }}"
skydive_analyzer_image: "{{ docker_image_url }}skydive-analyzer"
skydive_analyzer_tag: "{{ skydive_tag }}"
skydive_agent_image: "{{ docker_image_url }}skydive-agent"
skydive_agent_tag: "{{ skydive_tag }}"

##############################
# role: iscsi

Expand Down
26 changes: 0 additions & 26 deletions all/099-kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,35 +205,9 @@ gnocchi_statsd_enable_healthchecks: "no"

# required to be backward compatible
enable_ironic_dnsmasq: "no"
enable_skydive: "no"
enable_swift: "no"

keystone_admin_port: "35357"
keystone_admin_listen_port: "{{ keystone_admin_port }}"

enable_freezer: "no"
enable_horizon_freezer: "no"
enable_horizon_murano: "no"
enable_horizon_sahara: "no"
enable_horizon_senlin: "{{ enable_senlin | bool }}"
enable_horizon_solum: "no"
enable_horizon_vitrage: "no"
enable_ironic_pxe_uefi: "no"
enable_murano: "no"
enable_sahara: "no"
enable_senlin: "no"
enable_solum: "no"
enable_vitrage: "no"

enable_outward_rabbitmq: "no"
outward_rabbitmq_external_fqdn: "{{ kolla_external_fqdn }}"
outward_rabbitmq_management_port: "15674"
outward_rabbitmq_port: "5674"

senlin_internal_fqdn: "{{ kolla_internal_fqdn }}"
senlin_external_fqdn: "{{ kolla_external_fqdn }}"
senlin_api_port: "8778"
senlin_api_listen_port: "{{ senlin_api_port }}"
senlin_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else senlin_api_port }}"

enable_prometheus_msteams: "no"