summaryrefslogtreecommitdiffstats
path: root/xci/file
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-04-02 10:08:41 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2017-08-11 12:56:12 -0700
commit150bb4adacf77a4854c7fcd961f8f3687ae6afa1 (patch)
treeac939388b91206454a2180b31e70c5ca9c9a873c /xci/file
parentf1379ff726a2d3fa322e121071b77cdecd39cc2c (diff)
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>
Diffstat (limited to 'xci/file')
-rw-r--r--xci/file/setup-openstack.yml12
1 files changed, 11 insertions, 1 deletions
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