From cf5c1ce88c70af1932068f60948abaf4ce6b47d4 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 12 Oct 2017 11:22:14 +0100 Subject: [PATCH] Update development configuration for Kayobe 3.0.0 pike release We no longer need to explicitly set the openstack release, or override the container image build configuration for ironic. --- dev/dev-vagrant.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dev/dev-vagrant.yml b/dev/dev-vagrant.yml index 0c99fba76..dbf149c11 100644 --- a/dev/dev-vagrant.yml +++ b/dev/dev-vagrant.yml @@ -17,24 +17,6 @@ kayobe_ansible_user: vagrant # Set an interface name for LLDP discovery. inspector_lldp_switch_port_interface_default: eth0 -# Use the 4.0.2 release of kolla and kolla-ansible. -kolla_openstack_release: 4.0.2 - -# Kolla container image extensions. -kolla_build_blocks: - ironic_base_footer: | - # Install a more recent version of ironic-lib with a fix for - # https://bugs.launchpad.net/ironic/+bug/1673731. - RUN pip install -U --no-deps ironic-lib==2.7.0 - -# Kolla container image customisations. -kolla_build_customizations: - ironic_conductor_packages_append: - # e2fsprogs is required to create ext ephemeral filesystems. - - 'e2fsprogs' - # xfsprogs is required to create XFS ephemeral filesystems. - - 'xfsprogs' - # Disable swift. kolla_enable_swift: False