summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-03-22 12:08:30 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-03-22 12:08:30 +0100
commitb4506da7fc6319e97841ad3f7cdcc87c4f0b8d22 (patch)
tree1403d253211e313e8f68b63972810c1df571e1b2
parent68eb2ba33f9467d856838c61dc8e9c9d1cb35ded (diff)
xci: Fix the script name and remove openstack services
Change-Id: I774e12f15561de75920ca50bcb2fbaf917e004a9 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rwxr-xr-xjjb/xci/xci-deploy.sh2
-rw-r--r--prototypes/openstack-ansible/file/opnfv-setup-openstack.yml2
2 files changed, 1 insertions, 3 deletions
diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh
index 5856f52e7..dae67cf84 100755
--- 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 b3deba08d..aacdeffb0 100644
--- 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: