openstack/openstack-ansible
Code Issues Proposed changes

Removed container_release property from environment files

Browse Source 
This change removes the container_release property from environment
files used to generate inventory.  This change is because the
lxc_container_create role has been updated to build containers to the
same distribution and release as the host machine.

This change also removes the variable lxc_container_release from the
lxc-containers-create.yml play as it is no longer used by the
lxc_container_create role.

Change-Id: I7d2aea8f6548feb381bf2354965f05fa0a9a99b8
Depends-On: Iee304dd026e0865e0444259d2132122233d90f5f
This commit is contained in:
Michael Gugino 2016-05-02 13:56:10 -04:00 committed by Jesse Pretorius (odyssey4me)
parent 1b4550b0b8
commit a0bceb9dff
15 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/openstack_deploy/env.d/aodh.yml
View File

@ -24,7 +24,6 @@ container_skel:
- aodh_alarm_notifier - aodh_alarm_notifier
properties: properties:
service_name: aodh service_name: aodh
container_release: trusty
physical_skel: physical_skel:
metering-alarm_containers: metering-alarm_containers:

3
etc/openstack_deploy/env.d/ceilometer.yml
View File

@ -26,7 +26,6 @@ container_skel:
- ceilometer_api - ceilometer_api
properties: properties:
service_name: ceilometer service_name: ceilometer
container_release: trusty
ceilometer_collector_container: ceilometer_collector_container:
belongs_to: belongs_to:
- metering-infra_containers - metering-infra_containers
@ -34,7 +33,6 @@ container_skel:
- ceilometer_collector - ceilometer_collector
properties: properties:
service_name: ceilometer service_name: ceilometer
container_release: trusty
metering-compute_container: metering-compute_container:
belongs_to: belongs_to:
- metering-compute_containers - metering-compute_containers
@ -43,7 +41,6 @@ container_skel:
properties: properties:
is_metal: true is_metal: true
service_name: ceilometer service_name: ceilometer
container_release: trusty
physical_skel: physical_skel:
metering-compute_containers: metering-compute_containers:

3
etc/openstack_deploy/env.d/cinder.yml
View File

@ -37,7 +37,6 @@ container_skel:
- cinder_api - cinder_api
properties: properties:
service_name: cinder service_name: cinder
container_release: trusty
cinder_scheduler_container: cinder_scheduler_container:
belongs_to: belongs_to:
- infra_containers - infra_containers
@ -46,7 +45,6 @@ container_skel:
- cinder_scheduler - cinder_scheduler
properties: properties:
service_name: cinder service_name: cinder
container_release: trusty
cinder_volumes_container: cinder_volumes_container:
belongs_to: belongs_to:
- storage_containers - storage_containers
@ -61,7 +59,6 @@ container_skel:
# deployed on metal. # deployed on metal.
is_metal: true is_metal: true
service_name: cinder service_name: cinder
container_release: trusty
physical_skel: physical_skel:

2
etc/openstack_deploy/env.d/extra_container.yml.example
View File

@ -30,8 +30,6 @@ container_skel:
properties: properties:
# These are arbitrary key value pairs. # These are arbitrary key value pairs.
service_name: example_service service_name: example_service
# This is the image that the lxc container will be built from.
container_release: trusty
physical_skel: physical_skel:
# This maps back to items in the container_skel. # This maps back to items in the container_skel.

1
etc/openstack_deploy/env.d/galera.yml
View File

@ -29,4 +29,3 @@ container_skel:
properties: properties:
log_directory: mysql_logs log_directory: mysql_logs
service_name: galera service_name: galera
container_release: trusty

1
etc/openstack_deploy/env.d/glance.yml
View File

@ -32,5 +32,4 @@ container_skel:
- glance_registry - glance_registry
properties: properties:
service_name: glance service_name: glance
container_release: trusty
container_fs_size: 12G container_fs_size: 12G

1
etc/openstack_deploy/env.d/haproxy.yml
View File

@ -27,7 +27,6 @@ container_skel:
- haproxy - haproxy
properties: properties:
service_name: haproxy service_name: haproxy
#container_release: trusty
is_metal: true is_metal: true
physical_skel: physical_skel:

2
etc/openstack_deploy/env.d/heat.yml
View File

@ -39,7 +39,6 @@ container_skel:
- heat_api - heat_api
properties: properties:
service_name: heat service_name: heat
container_release: trusty
heat_engine_container: heat_engine_container:
belongs_to: belongs_to:
- infra_containers - infra_containers
@ -48,4 +47,3 @@ container_skel:
- heat_engine - heat_engine
properties: properties:
service_name: heat service_name: heat
container_release: trusty

1
etc/openstack_deploy/env.d/horizon.yml
View File

@ -28,4 +28,3 @@ container_skel:
- horizon - horizon
properties: properties:
service_name: horizon service_name: horizon
container_release: trusty

3
etc/openstack_deploy/env.d/ironic.yml
View File

@ -32,7 +32,6 @@ container_skel:
- ironic_api - ironic_api
properties: properties:
service_name: ironic service_name: ironic
container_release: trusty
ironic_conductor_container: ironic_conductor_container:
belongs_to: belongs_to:
- ironic-infra_containers - ironic-infra_containers
@ -40,7 +39,6 @@ container_skel:
- ironic_conductor - ironic_conductor
properties: properties:
service_name: ironic service_name: ironic
container_release: trusty
ironic_server_container: ironic_server_container:
belongs_to: belongs_to:
- ironic-server_containers - ironic-server_containers
@ -49,7 +47,6 @@ container_skel:
properties: properties:
is_metal: true is_metal: true
service_name: ironic service_name: ironic
container_release: trusty
physical_skel: physical_skel:

2
etc/openstack_deploy/env.d/neutron.yml
View File

@ -54,7 +54,6 @@ container_skel:
- neutron_lbaas_agent - neutron_lbaas_agent
properties: properties:
service_name: neutron service_name: neutron
container_release: trusty
neutron_server_container: neutron_server_container:
belongs_to: belongs_to:
- network_containers - network_containers
@ -62,7 +61,6 @@ container_skel:
- neutron_server - neutron_server
properties: properties:
service_name: neutron service_name: neutron
container_release: trusty
physical_skel: physical_skel:

7
etc/openstack_deploy/env.d/nova.yml
View File

@ -46,7 +46,6 @@ container_skel:
- nova_api_metadata - nova_api_metadata
properties: properties:
service_name: nova service_name: nova
container_release: trusty
nova_api_os_compute_container: nova_api_os_compute_container:
belongs_to: belongs_to:
- infra_containers - infra_containers
@ -55,7 +54,6 @@ container_skel:
- nova_api_os_compute - nova_api_os_compute
properties: properties:
service_name: nova service_name: nova
container_release: trusty
nova_cert_container: nova_cert_container:
belongs_to: belongs_to:
- infra_containers - infra_containers
@ -64,7 +62,6 @@ container_skel:
- nova_cert - nova_cert
properties: properties:
service_name: nova service_name: nova
container_release: trusty
nova_compute_container: nova_compute_container:
belongs_to: belongs_to:
- compute_containers - compute_containers
@ -74,7 +71,6 @@ container_skel:
properties: properties:
is_metal: true is_metal: true
service_name: nova service_name: nova
container_release: trusty
nova_conductor_container: nova_conductor_container:
belongs_to: belongs_to:
- infra_containers - infra_containers
@ -83,7 +79,6 @@ container_skel:
- nova_conductor - nova_conductor
properties: properties:
service_name: nova service_name: nova
container_release: trusty
nova_scheduler_container: nova_scheduler_container:
belongs_to: belongs_to:
- infra_containers - infra_containers
@ -92,7 +87,6 @@ container_skel:
- nova_scheduler - nova_scheduler
properties: properties:
service_name: nova service_name: nova
container_release: trusty
nova_console_container: nova_console_container:
belongs_to: belongs_to:
- infra_containers - infra_containers
@ -101,7 +95,6 @@ container_skel:
- nova_console - nova_console
properties: properties:
service_name: nova service_name: nova
container_release: trusty
physical_skel: physical_skel:

1
etc/openstack_deploy/env.d/swift-remote.yml
View File

@ -28,7 +28,6 @@ container_skel:
properties: properties:
is_metal: true is_metal: true
service_name: swift service_name: swift
container_release: trusty
physical_skel: physical_skel:

1
playbooks/lxc-containers-create.yml
View File

@ -55,4 +55,3 @@
- lxc-container-hostname - lxc-container-hostname
vars: vars:
is_metal: "{{ properties.is_metal|default(false) }}" is_metal: "{{ properties.is_metal|default(false) }}"
lxc_container_release: "{{ properties.container_release|default('trusty') }}"

6
releasenotes/notes/remove-container-release-fa49ff23ca8c1324.yaml Normal file
View File

@ -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.