diff options
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 2 | ||||
| -rw-r--r-- | xci/file/setup-openstack.yml | 12 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index 2814808f..d3b28ee1 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -34,7 +34,7 @@ export BIFROST_INVENTORY_SOURCE=$BAREMETAL_DATA_FILE # Default settings for VMs export TEST_VM_NUM_NODES=${TEST_VM_NUM_NODES:-3} -export TEST_VM_NODE_NAMES=${TEST_VM_NODE_NAMES:-"xcimaster controller00 compute00"} +export TEST_VM_NODE_NAMES=${TEST_VM_NODE_NAMES:-"opnfv controller00 compute00"} export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} export VM_CPU=${VM_CPU:-4} export VM_DISK=${VM_DISK:-100} diff --git a/xci/file/setup-openstack.yml b/xci/file/setup-openstack.yml index 48f156ad..bd5d5cd9 100644 --- a/xci/file/setup-openstack.yml +++ b/xci/file/setup-openstack.yml @@ -1,5 +1,5 @@ --- -# Copyright 2017, Rackspace US, Inc. and others +# Copyright 2014, Rackspace US, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,5 +22,15 @@ - include: os-horizon-install.yml - include: os-ceilometer-install.yml - include: os-aodh-install.yml +- include: os-designate-install.yml +#NOTE(stevelle) Ensure Gnocchi identities exist before Swift +- include: os-gnocchi-install.yml + when: + - gnocchi_storage_driver is defined + - gnocchi_storage_driver == 'swift' + vars: + gnocchi_identity_only: True - include: os-swift-install.yml +- include: os-gnocchi-install.yml - include: os-ironic-install.yml +- include: os-tempest-install.yml diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 7eb3ecdf..da5bb26c 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -31,7 +31,7 @@ source $XCI_PATH/config/user-vars # source pinned versions source $XCI_PATH/config/pinned-versions # source flavor configuration -source "$XCI_PATH/flavors/${XCI_FLAVOR}-vars" +source "$XCI_PATH/config/${XCI_FLAVOR}-vars" # source xci configuration source $XCI_PATH/config/env-vars |