Browse Source

Rename contrib to container-images for packaging

A contrib directory would not be considered packagable, but we have an
increasing need to package overcloud_containers.yaml and
tripleo_kolla_template_overrides.j2 for image building and pulling in
CI and other environments.

This change renames contrib to container-images and adds symlinks in
contrib so that scripts[1] and documentation[2] that depend on this
location can be moved over to using packaged container-images rather
than git contrib.

[1] http://git.openstack.org/cgit/openstack/tripleo-quickstart-extras/tree/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2#n33
    https://github.com/dprince/undercloud_containers/blob/master/build_kolla.sh#L47

[2] http://git.openstack.org/cgit/openstack/tripleo-docs/tree/doc/source/containers_deployment/tips_tricks.rst#n167
    http://git.openstack.org/cgit/openstack/tripleo-docs/tree/doc/source/containers_deployment/architecture.rst#n52
    http://git.openstack.org/cgit/openstack/tripleo-docs/tree/doc/source/containers_deployment/overcloud.rst#n58

Change-Id: Ifb736fb52e255260a4f1931b0b9b27206f2f1d82
changes/28/453428/3
Steve Baker 4 years ago
parent
commit
58cd1601f6
5 changed files with 80 additions and 77 deletions
  1. +44
    -0
      container-images/overcloud_containers.yaml
  2. +33
    -0
      container-images/tripleo_kolla_template_overrides.j2
  3. +0
    -44
      contrib/overcloud_containers.yaml
  4. +1
    -0
      contrib/overcloud_containers.yaml
  5. +0
    -33
      contrib/tripleo_kolla_template_overrides.j2
  6. +1
    -0
      contrib/tripleo_kolla_template_overrides.j2
  7. +1
    -0
      setup.cfg

+ 44
- 0
container-images/overcloud_containers.yaml View File

@ -0,0 +1,44 @@
container_images:
- imagename: tripleoupstream/centos-binary-aodh-api:latest
- imagename: tripleoupstream/centos-binary-aodh-evaluator:latest
- imagename: tripleoupstream/centos-binary-aodh-notifier:latest
- imagename: tripleoupstream/centos-binary-aodh-listener:latest
- imagename: tripleoupstream/centos-binary-glance-api:latest
- imagename: tripleoupstream/centos-binary-gnocchi-api:latest
- imagename: tripleoupstream/centos-binary-gnocchi-metricd:latest
- imagename: tripleoupstream/centos-binary-gnocchi-statsd:latest
- imagename: tripleoupstream/centos-binary-heat-api:latest
- imagename: tripleoupstream/centos-binary-heat-api-cfn:latest
- imagename: tripleoupstream/centos-binary-heat-api-cloudwatch:latest
- imagename: tripleoupstream/centos-binary-heat-engine:latest
- imagename: tripleoupstream/centos-binary-ironic-api:latest
- imagename: tripleoupstream/centos-binary-ironic-conductor:latest
- imagename: tripleoupstream/centos-binary-ironic-pxe:latest
- imagename: tripleoupstream/centos-binary-keystone:latest
- imagename: tripleoupstream/centos-binary-mariadb:latest
- imagename: tripleoupstream/centos-binary-memcached:latest
- imagename: tripleoupstream/centos-binary-mistral-api:latest
- imagename: tripleoupstream/centos-binary-mistral-engine:latest
- imagename: tripleoupstream/centos-binary-mistral-executor:latest
- imagename: tripleoupstream/centos-binary-mongodb:latest
- imagename: tripleoupstream/centos-binary-neutron-dhcp-agent:latest
- imagename: tripleoupstream/centos-binary-neutron-l3-agent:latest
- imagename: tripleoupstream/centos-binary-neutron-metadata-agent:latest
- imagename: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest
- imagename: tripleoupstream/centos-binary-neutron-server:latest
- imagename: tripleoupstream/centos-binary-nova-api:latest
- imagename: tripleoupstream/centos-binary-nova-base:latest
- imagename: tripleoupstream/centos-binary-nova-compute:latest
- imagename: tripleoupstream/centos-binary-nova-conductor:latest
- imagename: tripleoupstream/centos-binary-nova-compute-ironic:latest
- imagename: tripleoupstream/centos-binary-nova-libvirt:latest
- imagename: tripleoupstream/centos-binary-nova-placement-api:latest
- imagename: tripleoupstream/centos-binary-nova-scheduler:latest
- imagename: tripleoupstream/centos-binary-panko-api:latest
- imagename: tripleoupstream/centos-binary-rabbitmq:latest
- imagename: tripleoupstream/centos-binary-redis:latest
- imagename: tripleoupstream/centos-binary-swift-account:latest
- imagename: tripleoupstream/centos-binary-swift-container:latest
- imagename: tripleoupstream/centos-binary-swift-proxy-server:latest
- imagename: tripleoupstream/centos-binary-swift-object:latest
- imagename: tripleoupstream/centos-binary-zaqar:latest

+ 33
- 0
container-images/tripleo_kolla_template_overrides.j2 View File

@ -0,0 +1,33 @@
{% extends parent_template %}
# Disable external repos
{% set base_yum_repo_files_override = [] %}
{% set base_yum_url_packages_override = [] %}
{% set base_yum_repo_keys_override = [] %}
{% set base_centos_binary_packages_append = ['puppet'] %}
{% set nova_scheduler_packages_append = ['openstack-tripleo-common'] %}
# Required for mistral-db-populate to load tripleo custom actions on
# the undercloud
{% set mistral_api_packages_append = ['openstack-tripleo-common'] %}
{% set mistral_engine_packages_append = ['openstack-tripleo-common'] %}
# NOTE: Mistral executor needs to run nova-manage cells_v2 commands on
# the undercloud baremetal workflows.
{% set mistral_executor_packages_append = ['openstack-tripleo-common', 'openstack-nova-common'] %}
# FIXME (kolla review to add ceilometer to swift proxy image)
{% set swift_proxy_server_packages_append = ['openstack-ceilometer-common'] %}
# Remove packages not present in repos
{% set openstack_base_packages_remove = ['Percona-Server-shared-56'] %}
# Use mariadb-server package
{% set mariadb_packages_remove = ['MariaDB-Galera-server', 'MariaDB-client'] %}
{% set mariadb_packages_append = ['mariadb-server'] %}
# We'll configure mariadb with galera.cnf
{% block mariadb_footer %}
RUN rm /etc/my.cnf.d/mariadb-server.cnf /etc/my.cnf.d/auth_gssapi.cnf
{% endblock %}

+ 0
- 44
contrib/overcloud_containers.yaml View File

@ -1,44 +0,0 @@
container_images:
- imagename: tripleoupstream/centos-binary-aodh-api:latest
- imagename: tripleoupstream/centos-binary-aodh-evaluator:latest
- imagename: tripleoupstream/centos-binary-aodh-notifier:latest
- imagename: tripleoupstream/centos-binary-aodh-listener:latest
- imagename: tripleoupstream/centos-binary-glance-api:latest
- imagename: tripleoupstream/centos-binary-gnocchi-api:latest
- imagename: tripleoupstream/centos-binary-gnocchi-metricd:latest
- imagename: tripleoupstream/centos-binary-gnocchi-statsd:latest
- imagename: tripleoupstream/centos-binary-heat-api:latest
- imagename: tripleoupstream/centos-binary-heat-api-cfn:latest
- imagename: tripleoupstream/centos-binary-heat-api-cloudwatch:latest
- imagename: tripleoupstream/centos-binary-heat-engine:latest
- imagename: tripleoupstream/centos-binary-ironic-api:latest
- imagename: tripleoupstream/centos-binary-ironic-conductor:latest
- imagename: tripleoupstream/centos-binary-ironic-pxe:latest
- imagename: tripleoupstream/centos-binary-keystone:latest
- imagename: tripleoupstream/centos-binary-mariadb:latest
- imagename: tripleoupstream/centos-binary-memcached:latest
- imagename: tripleoupstream/centos-binary-mistral-api:latest
- imagename: tripleoupstream/centos-binary-mistral-engine:latest
- imagename: tripleoupstream/centos-binary-mistral-executor:latest
- imagename: tripleoupstream/centos-binary-mongodb:latest
- imagename: tripleoupstream/centos-binary-neutron-dhcp-agent:latest
- imagename: tripleoupstream/centos-binary-neutron-l3-agent:latest
- imagename: tripleoupstream/centos-binary-neutron-metadata-agent:latest
- imagename: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest
- imagename: tripleoupstream/centos-binary-neutron-server:latest
- imagename: tripleoupstream/centos-binary-nova-api:latest
- imagename: tripleoupstream/centos-binary-nova-base:latest
- imagename: tripleoupstream/centos-binary-nova-compute:latest
- imagename: tripleoupstream/centos-binary-nova-conductor:latest
- imagename: tripleoupstream/centos-binary-nova-compute-ironic:latest
- imagename: tripleoupstream/centos-binary-nova-libvirt:latest
- imagename: tripleoupstream/centos-binary-nova-placement-api:latest
- imagename: tripleoupstream/centos-binary-nova-scheduler:latest
- imagename: tripleoupstream/centos-binary-panko-api:latest
- imagename: tripleoupstream/centos-binary-rabbitmq:latest
- imagename: tripleoupstream/centos-binary-redis:latest
- imagename: tripleoupstream/centos-binary-swift-account:latest
- imagename: tripleoupstream/centos-binary-swift-container:latest
- imagename: tripleoupstream/centos-binary-swift-proxy-server:latest
- imagename: tripleoupstream/centos-binary-swift-object:latest
- imagename: tripleoupstream/centos-binary-zaqar:latest

+ 1
- 0
contrib/overcloud_containers.yaml View File

@ -0,0 +1 @@
../container-images/overcloud_containers.yaml

+ 0
- 33
contrib/tripleo_kolla_template_overrides.j2 View File

@ -1,33 +0,0 @@
{% extends parent_template %}
# Disable external repos
{% set base_yum_repo_files_override = [] %}
{% set base_yum_url_packages_override = [] %}
{% set base_yum_repo_keys_override = [] %}
{% set base_centos_binary_packages_append = ['puppet'] %}
{% set nova_scheduler_packages_append = ['openstack-tripleo-common'] %}
# Required for mistral-db-populate to load tripleo custom actions on
# the undercloud
{% set mistral_api_packages_append = ['openstack-tripleo-common'] %}
{% set mistral_engine_packages_append = ['openstack-tripleo-common'] %}
# NOTE: Mistral executor needs to run nova-manage cells_v2 commands on
# the undercloud baremetal workflows.
{% set mistral_executor_packages_append = ['openstack-tripleo-common', 'openstack-nova-common'] %}
# FIXME (kolla review to add ceilometer to swift proxy image)
{% set swift_proxy_server_packages_append = ['openstack-ceilometer-common'] %}
# Remove packages not present in repos
{% set openstack_base_packages_remove = ['Percona-Server-shared-56'] %}
# Use mariadb-server package
{% set mariadb_packages_remove = ['MariaDB-Galera-server', 'MariaDB-client'] %}
{% set mariadb_packages_append = ['mariadb-server'] %}
# We'll configure mariadb with galera.cnf
{% block mariadb_footer %}
RUN rm /etc/my.cnf.d/mariadb-server.cnf /etc/my.cnf.d/auth_gssapi.cnf
{% endblock %}

+ 1
- 0
contrib/tripleo_kolla_template_overrides.j2 View File

@ -0,0 +1 @@
../container-images/tripleo_kolla_template_overrides.j2

+ 1
- 0
setup.cfg View File

@ -34,6 +34,7 @@ scripts =
data_files =
lib/heat/undercloud_heat_plugins = undercloud_heat_plugins/*
share/tripleo-common = sudoers
share/tripleo-common/container-images = container-images/*
share/tripleo-common/image-yaml = image-yaml/*
share/tripleo-common/workbooks = workbooks/*


Loading…
Cancel
Save