diff --git a/etc/openstack_deploy/env.d/aodh.yml b/etc/openstack_deploy/env.d/aodh.yml index f163419225..73a6abecde 100644 --- a/etc/openstack_deploy/env.d/aodh.yml +++ b/etc/openstack_deploy/env.d/aodh.yml @@ -24,7 +24,6 @@ container_skel: - aodh_alarm_notifier properties: service_name: aodh - container_release: trusty physical_skel: metering-alarm_containers: diff --git a/etc/openstack_deploy/env.d/ceilometer.yml b/etc/openstack_deploy/env.d/ceilometer.yml index ef379ec88d..67e472487b 100644 --- a/etc/openstack_deploy/env.d/ceilometer.yml +++ b/etc/openstack_deploy/env.d/ceilometer.yml @@ -26,7 +26,6 @@ container_skel: - ceilometer_api properties: service_name: ceilometer - container_release: trusty ceilometer_collector_container: belongs_to: - metering-infra_containers @@ -34,7 +33,6 @@ container_skel: - ceilometer_collector properties: service_name: ceilometer - container_release: trusty metering-compute_container: belongs_to: - metering-compute_containers @@ -43,7 +41,6 @@ container_skel: properties: is_metal: true service_name: ceilometer - container_release: trusty physical_skel: metering-compute_containers: diff --git a/etc/openstack_deploy/env.d/cinder.yml b/etc/openstack_deploy/env.d/cinder.yml index 9e60817143..9aad6b279f 100644 --- a/etc/openstack_deploy/env.d/cinder.yml +++ b/etc/openstack_deploy/env.d/cinder.yml @@ -37,7 +37,6 @@ container_skel: - cinder_api properties: service_name: cinder - container_release: trusty cinder_scheduler_container: belongs_to: - infra_containers @@ -46,7 +45,6 @@ container_skel: - cinder_scheduler properties: service_name: cinder - container_release: trusty cinder_volumes_container: belongs_to: - storage_containers @@ -61,7 +59,6 @@ container_skel: # deployed on metal. is_metal: true service_name: cinder - container_release: trusty physical_skel: diff --git a/etc/openstack_deploy/env.d/extra_container.yml.example b/etc/openstack_deploy/env.d/extra_container.yml.example index 75d944ea48..88a73b1f5c 100644 --- a/etc/openstack_deploy/env.d/extra_container.yml.example +++ b/etc/openstack_deploy/env.d/extra_container.yml.example @@ -30,8 +30,6 @@ container_skel: properties: # These are arbitrary key value pairs. service_name: example_service - # This is the image that the lxc container will be built from. - container_release: trusty physical_skel: # This maps back to items in the container_skel. diff --git a/etc/openstack_deploy/env.d/galera.yml b/etc/openstack_deploy/env.d/galera.yml index 9cc1d372d7..9e202e72b9 100644 --- a/etc/openstack_deploy/env.d/galera.yml +++ b/etc/openstack_deploy/env.d/galera.yml @@ -29,4 +29,3 @@ container_skel: properties: log_directory: mysql_logs service_name: galera - container_release: trusty diff --git a/etc/openstack_deploy/env.d/glance.yml b/etc/openstack_deploy/env.d/glance.yml index e01658d6e5..fa1ce6ae5b 100644 --- a/etc/openstack_deploy/env.d/glance.yml +++ b/etc/openstack_deploy/env.d/glance.yml @@ -32,5 +32,4 @@ container_skel: - glance_registry properties: service_name: glance - container_release: trusty container_fs_size: 12G diff --git a/etc/openstack_deploy/env.d/haproxy.yml b/etc/openstack_deploy/env.d/haproxy.yml index 39ca70c428..42ad085d4a 100644 --- a/etc/openstack_deploy/env.d/haproxy.yml +++ b/etc/openstack_deploy/env.d/haproxy.yml @@ -27,7 +27,6 @@ container_skel: - haproxy properties: service_name: haproxy - #container_release: trusty is_metal: true physical_skel: diff --git a/etc/openstack_deploy/env.d/heat.yml b/etc/openstack_deploy/env.d/heat.yml index f99c5e8a45..40415720a5 100644 --- a/etc/openstack_deploy/env.d/heat.yml +++ b/etc/openstack_deploy/env.d/heat.yml @@ -39,7 +39,6 @@ container_skel: - heat_api properties: service_name: heat - container_release: trusty heat_engine_container: belongs_to: - infra_containers @@ -48,4 +47,3 @@ container_skel: - heat_engine properties: service_name: heat - container_release: trusty diff --git a/etc/openstack_deploy/env.d/horizon.yml b/etc/openstack_deploy/env.d/horizon.yml index e2d79b4712..c73e95e2fc 100644 --- a/etc/openstack_deploy/env.d/horizon.yml +++ b/etc/openstack_deploy/env.d/horizon.yml @@ -28,4 +28,3 @@ container_skel: - horizon properties: service_name: horizon - container_release: trusty diff --git a/etc/openstack_deploy/env.d/ironic.yml b/etc/openstack_deploy/env.d/ironic.yml index 27aff0bb0b..67d4b06dae 100644 --- a/etc/openstack_deploy/env.d/ironic.yml +++ b/etc/openstack_deploy/env.d/ironic.yml @@ -32,7 +32,6 @@ container_skel: - ironic_api properties: service_name: ironic - container_release: trusty ironic_conductor_container: belongs_to: - ironic-infra_containers @@ -40,7 +39,6 @@ container_skel: - ironic_conductor properties: service_name: ironic - container_release: trusty ironic_server_container: belongs_to: - ironic-server_containers @@ -49,7 +47,6 @@ container_skel: properties: is_metal: true service_name: ironic - container_release: trusty physical_skel: diff --git a/etc/openstack_deploy/env.d/neutron.yml b/etc/openstack_deploy/env.d/neutron.yml index 0c50a8e031..cd2df75f71 100644 --- a/etc/openstack_deploy/env.d/neutron.yml +++ b/etc/openstack_deploy/env.d/neutron.yml @@ -54,7 +54,6 @@ container_skel: - neutron_lbaas_agent properties: service_name: neutron - container_release: trusty neutron_server_container: belongs_to: - network_containers @@ -62,7 +61,6 @@ container_skel: - neutron_server properties: service_name: neutron - container_release: trusty physical_skel: diff --git a/etc/openstack_deploy/env.d/nova.yml b/etc/openstack_deploy/env.d/nova.yml index c1c6b6ae62..bebc6ccfc4 100644 --- a/etc/openstack_deploy/env.d/nova.yml +++ b/etc/openstack_deploy/env.d/nova.yml @@ -46,7 +46,6 @@ container_skel: - nova_api_metadata properties: service_name: nova - container_release: trusty nova_api_os_compute_container: belongs_to: - infra_containers @@ -55,7 +54,6 @@ container_skel: - nova_api_os_compute properties: service_name: nova - container_release: trusty nova_cert_container: belongs_to: - infra_containers @@ -64,7 +62,6 @@ container_skel: - nova_cert properties: service_name: nova - container_release: trusty nova_compute_container: belongs_to: - compute_containers @@ -74,7 +71,6 @@ container_skel: properties: is_metal: true service_name: nova - container_release: trusty nova_conductor_container: belongs_to: - infra_containers @@ -83,7 +79,6 @@ container_skel: - nova_conductor properties: service_name: nova - container_release: trusty nova_scheduler_container: belongs_to: - infra_containers @@ -92,7 +87,6 @@ container_skel: - nova_scheduler properties: service_name: nova - container_release: trusty nova_console_container: belongs_to: - infra_containers @@ -101,7 +95,6 @@ container_skel: - nova_console properties: service_name: nova - container_release: trusty physical_skel: diff --git a/etc/openstack_deploy/env.d/swift-remote.yml b/etc/openstack_deploy/env.d/swift-remote.yml index 1fa630c4f7..c70db76421 100644 --- a/etc/openstack_deploy/env.d/swift-remote.yml +++ b/etc/openstack_deploy/env.d/swift-remote.yml @@ -28,7 +28,6 @@ container_skel: properties: is_metal: true service_name: swift - container_release: trusty physical_skel: diff --git a/playbooks/lxc-containers-create.yml b/playbooks/lxc-containers-create.yml index e518348a19..fc38999086 100644 --- a/playbooks/lxc-containers-create.yml +++ b/playbooks/lxc-containers-create.yml @@ -55,4 +55,3 @@ - lxc-container-hostname vars: is_metal: "{{ properties.is_metal|default(false) }}" - lxc_container_release: "{{ properties.container_release|default('trusty') }}" diff --git a/releasenotes/notes/remove-container-release-fa49ff23ca8c1324.yaml b/releasenotes/notes/remove-container-release-fa49ff23ca8c1324.yaml new file mode 100644 index 0000000000..d018727182 --- /dev/null +++ b/releasenotes/notes/remove-container-release-fa49ff23ca8c1324.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - The container property ``container_release`` has been removed as this is automatically set + to the same version as the host in the container creation process. + - The variable ``lxc_container_release`` has been removed from the ``lxc-container-create.yml`` + playbook as it is no longer consumed by the container creation process.