xci: Fix the script name and remove openstack services

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

diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh
index 5856f52..dae67cf 100755 (executable)
--- a/jjb/xci/xci-deploy.sh
+++ b/jjb/xci/xci-deploy.sh
@@ -67,4 +67,4 @@ if [ $USE_PROMOTED_VERSIONS = "true" ]; then
 fi
 
 cd /opt/releng/prototypes/openstack-ansible/scripts
-sudo -E ./osa_deploy.sh
+sudo -E ./osa-deploy.sh

diff --git a/prototypes/openstack-ansible/file/opnfv-setup-openstack.yml b/prototypes/openstack-ansible/file/opnfv-setup-openstack.yml
index b3deba0..aacdeff 100644 (file)
--- a/prototypes/openstack-ansible/file/opnfv-setup-openstack.yml
+++ b/prototypes/openstack-ansible/file/opnfv-setup-openstack.yml
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 - include: os-keystone-install.yml
-- include: os-barbican-install.yml
 - include: os-glance-install.yml
 - include: os-cinder-install.yml
 - include: os-nova-install.yml
@@ -23,7 +22,6 @@
 - 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: