From 97eb3b3378552001c32767a998f46b578532b923 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Mon, 20 Jun 2016 15:16:57 -0700 Subject: [PATCH] Remove remaining container_release properties The lxc_container_create role has been updated to build containers to the same distribution and release as the host machine. The container_release property defined in environment files used to generate inventory is no longer required. I7d2aea8f6548feb381bf2354965f05fa0a9a99b8 removed this property from half of the environment files. This change removes it from all remaining files. Change-Id: I8bff7613639676797159eac75cef0dd091bda7a4 --- etc/openstack_deploy/env.d/keystone.yml | 1 - etc/openstack_deploy/env.d/memcache.yml | 1 - etc/openstack_deploy/env.d/pkg_repo.yml | 1 - etc/openstack_deploy/env.d/rabbitmq.yml | 1 - etc/openstack_deploy/env.d/rsyslog.yml | 1 - etc/openstack_deploy/env.d/swift.yml | 4 ---- etc/openstack_deploy/env.d/utility.yml | 1 - 7 files changed, 10 deletions(-) diff --git a/etc/openstack_deploy/env.d/keystone.yml b/etc/openstack_deploy/env.d/keystone.yml index 3ae2e58ba3..b1c2e75e8b 100644 --- a/etc/openstack_deploy/env.d/keystone.yml +++ b/etc/openstack_deploy/env.d/keystone.yml @@ -28,7 +28,6 @@ container_skel: - keystone properties: service_name: keystone - container_release: trusty physical_skel: diff --git a/etc/openstack_deploy/env.d/memcache.yml b/etc/openstack_deploy/env.d/memcache.yml index acbd351ad3..f64ab871a3 100644 --- a/etc/openstack_deploy/env.d/memcache.yml +++ b/etc/openstack_deploy/env.d/memcache.yml @@ -28,4 +28,3 @@ container_skel: - memcached properties: service_name: memcached - container_release: trusty diff --git a/etc/openstack_deploy/env.d/pkg_repo.yml b/etc/openstack_deploy/env.d/pkg_repo.yml index 89b3eed1b0..b59952399d 100644 --- a/etc/openstack_deploy/env.d/pkg_repo.yml +++ b/etc/openstack_deploy/env.d/pkg_repo.yml @@ -27,7 +27,6 @@ container_skel: - pkg_repo properties: service_name: repo - container_release: trusty physical_skel: diff --git a/etc/openstack_deploy/env.d/rabbitmq.yml b/etc/openstack_deploy/env.d/rabbitmq.yml index b5b732370a..eddfce1cca 100644 --- a/etc/openstack_deploy/env.d/rabbitmq.yml +++ b/etc/openstack_deploy/env.d/rabbitmq.yml @@ -28,4 +28,3 @@ container_skel: - rabbitmq properties: service_name: rabbitmq - container_release: trusty diff --git a/etc/openstack_deploy/env.d/rsyslog.yml b/etc/openstack_deploy/env.d/rsyslog.yml index 0df8302e9a..7094ec5880 100644 --- a/etc/openstack_deploy/env.d/rsyslog.yml +++ b/etc/openstack_deploy/env.d/rsyslog.yml @@ -27,7 +27,6 @@ container_skel: - rsyslog properties: service_name: rsyslog - container_release: trusty physical_skel: diff --git a/etc/openstack_deploy/env.d/swift.yml b/etc/openstack_deploy/env.d/swift.yml index b281afdf97..e73cd93b39 100644 --- a/etc/openstack_deploy/env.d/swift.yml +++ b/etc/openstack_deploy/env.d/swift.yml @@ -36,7 +36,6 @@ container_skel: - swift_proxy properties: service_name: swift - container_release: trusty swift_acc_container: belongs_to: - swift_containers @@ -45,7 +44,6 @@ container_skel: properties: is_metal: true service_name: swift - container_release: trusty swift_obj_container: belongs_to: - swift_containers @@ -54,7 +52,6 @@ container_skel: properties: is_metal: true service_name: swift - container_release: trusty swift_cont_container: belongs_to: - swift_containers @@ -63,7 +60,6 @@ container_skel: properties: is_metal: true service_name: swift - container_release: trusty physical_skel: diff --git a/etc/openstack_deploy/env.d/utility.yml b/etc/openstack_deploy/env.d/utility.yml index 7c7347b808..3fffbddb3f 100644 --- a/etc/openstack_deploy/env.d/utility.yml +++ b/etc/openstack_deploy/env.d/utility.yml @@ -28,4 +28,3 @@ container_skel: - utility properties: service_name: utility - container_release: trusty