diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-10-04 15:33:04 +0200 |
|---|---|---|
| committer | Manuel Buil <mbuil@suse.com> | 2018-10-26 09:56:02 +0200 |
| commit | c473915f5515eb6bb66a6ae4e8e2352dc9177654 (patch) | |
| tree | b095691d05f69b11caa9db771f083f7a285be620 | |
| parent | ebe6bd459f7751fe7a82a6f5c5f78c393465e3fc (diff) | |
Reduce complexity when using bifrost roles
We are using two variables which have a similar scope:
- create_image_via_dib
- use_prebuilt_images
We could use one of them and not both. create_image_via_dib is selected
because it also exists in upstream bifrost
use_prebuilt_images = false is the same as create_image_via_dib = true
use_prebuilt_images = true is the same as create_image_via_dib = false
Change-Id: Ieaab78f1dc2d199746a2b13ebc82e9dc615d92e9
Signed-off-by: Manuel Buil <mbuil@suse.com>
| -rwxr-xr-x | xci/config/user-vars | 2 | ||||
| -rw-r--r-- | xci/infra/bifrost/infra-provision.sh | 2 | ||||
| -rw-r--r-- | xci/infra/bifrost/playbooks/opnfv-virtual.yml | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/xci/config/user-vars b/xci/config/user-vars index 2625de24..951688af 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -53,6 +53,6 @@ export INFRA_DEPLOYMENT=${INFRA_DEPLOYMENT:-bifrost} export XCI_ANSIBLE_PARAMS=${XCI_ANSIBLE_PARAMS:-""} export RUN_TEMPEST=${RUN_TEMPEST:-false} export CORE_OPENSTACK_INSTALL=${CORE_OPENSTACK_INSTALL:-false} -export BIFROST_USE_PREBUILT_IMAGES=${BIFROST_USE_PREBUILT_IMAGES:-false} +export BIFROST_CREATE_IMAGE_VIA_DIB=${BIFROST_CREATE_IMAGE_VIA_DIB:-true} # Set this to to true to force XCI to re-create the target OS images export CLEAN_DIB_IMAGES=${CLEAN_DIB_IMAGES:-false} diff --git a/xci/infra/bifrost/infra-provision.sh b/xci/infra/bifrost/infra-provision.sh index e60e9de0..01019eae 100644 --- a/xci/infra/bifrost/infra-provision.sh +++ b/xci/infra/bifrost/infra-provision.sh @@ -71,7 +71,7 @@ ansible-playbook ${XCI_ANSIBLE_PARAMS} \ -e ironicclient_source_install=true \ -e ironicclient_git_branch=${BIFROST_IRONIC_CLIENT_VERSION:-master} \ -e ironic_git_branch=${BIFROST_IRONIC_VERSION:-master} \ - -e use_prebuilt_images=${BIFROST_USE_PREBUILT_IMAGES:-false} \ + -e create_image_via_dib=${BIFROST_CREATE_IMAGE_VIA_DIB:-true} \ -e xci_distro=${XCI_DISTRO} \ -e ironic_url="http://192.168.122.2:6385/" \ ${BIFROST_ROOT_DIR}/playbooks/opnfv-virtual.yml diff --git a/xci/infra/bifrost/playbooks/opnfv-virtual.yml b/xci/infra/bifrost/playbooks/opnfv-virtual.yml index 313919ba..77f4b512 100644 --- a/xci/infra/bifrost/playbooks/opnfv-virtual.yml +++ b/xci/infra/bifrost/playbooks/opnfv-virtual.yml @@ -52,7 +52,7 @@ mode: '0755' owner: 'root' group: 'root' - when: use_prebuilt_images | bool == true + when: create_image_via_dib | bool == false - name: Ensure /etc/hosts has good defaults lineinfile: create: yes @@ -101,7 +101,6 @@ when: - create_image_via_dib | bool == true - transform_boot_image | bool == false - - use_prebuilt_images | bool == false - role: bifrost-keystone-client-config clouds: bifrost: |