xci: Adjust and fix jobs and scripts

This change
- fixes GIT_BASE in jobs
- adjusts build blockers
- fixes where the flavor vars should be sourced from
- sources flavor vars for bifrost periodic jobs
- renames the xcimaster node to opnfv to be consistent
- removes obsolete xci-provision.sh script
- enable additional openstack services including tempest to
  ensure the deployment is sane

Change-Id: Ifdce1da52d68a26c2b87e1bd3b1996ec119d8d90
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh
index 2814808..d3b28ee 100755 (executable)
--- 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 48f156a..bd5d5cd 100644 (file)
--- 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 7eb3ecd..da5bb26 100755 (executable)
--- 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