openstack
/
openstack-ansible-openstack_hosts
Code Issues Proposed changes

Correct defaults 

The `is_container` and `cache_timeout` needed to be updated to
accomodate a typical deployment.

The cache timeout was being defined as a default and as a variable
which is loaded at the start of the role. This make it impossible to
override this option. The `cache_timeout` option has been removed
from the variable files. Because this option is defined in the
defaults it will retain it's current functionality but allow deployers
to override this option.

The `is_container` default was using the `ansible_virtualization_type`
and checking if the string was returned as "lxc". This option was updated
to now also detect if the container type is "systemd-nspawn".

Change-Id: I4d65a7f83055d0483aaf23f487551341686396c6
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2018-06-12 10:10:36 -05:00
parent ef9c4f1ea5
commit c126f7e3fe
No known key found for this signature in database
GPG Key ID: 9443251A787B9FB3
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -24,7 +24,7 @@ openstack_distrib_description: "OpenStack-Ansible"
openstack_distrib_file: yes
openstack_distrib_file_path: "/etc/openstack-release"
is_container: "{{ ansible_virtualization_type == 'lxc' }}"
is_container: "{{ ansible_virtualization_type in ['lxc', 'systemd-nspawn'] }}"
openstack_host_sysstat_enabled: true
openstack_host_sysstat_interval: 1

3
vars/ubuntu-16.04.yml
View File

@ -13,9 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
## APT Cache Options
cache_timeout: 600
## Defined required kernel
openstack_host_required_kernel: 4.4.0-0-generic
openstack_host_sysstat_file: /etc/default/sysstat

3
vars/ubuntu-18.04.yml
View File

@ -13,9 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
## APT Cache Options
cache_timeout: 600
## Defined required kernel
openstack_host_required_kernel: 4.15.0-0-generic
openstack_host_sysstat_file: /etc/default/sysstat