From 29b4e8756da67e65c928d8cec6afff998b74a863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Fri, 11 Mar 2016 17:14:03 +0900
Subject: [PATCH] Stop shipping broken openrc in vagrant
Instead, rely on kolla-ansible post-deploy to generate a configuration
file with valid environment variables.
Change-Id: Ie62932afc96e2486410a1d4e14162a88b1733c22
Closes-Bug: #1555972
---
dev/vagrant/centos-bootstrap.sh | 11 -----------
dev/vagrant/ubuntu-bootstrap.sh | 11 -----------
doc/vagrant-dev-env.rst | 3 ++-
3 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/dev/vagrant/centos-bootstrap.sh b/dev/vagrant/centos-bootstrap.sh
index 0aee56eb44..9030a2cdb0 100644
--- a/dev/vagrant/centos-bootstrap.sh
+++ b/dev/vagrant/centos-bootstrap.sh
@@ -117,17 +117,6 @@ scp_if_ssh=True
EOF
chown vagrant: ~vagrant/.ansible.cfg
- # The openrc file.
- cat > ~vagrant/openrc <<EOF
-export OS_AUTH_URL="${ADMIN_PROTOCOL}://${SUPPORT_NODE}:35357/v3"
-export OS_USERNAME=admin
-export OS_PASSWORD=password
-export OS_TENANT_NAME=admin
-export OS_VOLUME_API_VERSION=3
-export OS_USER_DOMAIN_ID=default
-EOF
- chown vagrant: ~vagrant/openrc
-
mkdir -p /etc/kolla/config/nova/
cat > /etc/kolla/config/nova/nova-compute.conf <<EOF
[libvirt]
diff --git a/dev/vagrant/ubuntu-bootstrap.sh b/dev/vagrant/ubuntu-bootstrap.sh
index feeb7141f2..b57fd1194a 100644
--- a/dev/vagrant/ubuntu-bootstrap.sh
+++ b/dev/vagrant/ubuntu-bootstrap.sh
@@ -91,17 +91,6 @@ scp_if_ssh=True
EOF
chown vagrant: ~vagrant/.ansible.cfg
- # The openrc file.
- cat > ~vagrant/openrc <<EOF
-export OS_AUTH_URL="${ADMIN_PROTOCOL}://${SUPPORT_NODE}:35357/v3"
-export OS_USERNAME=admin
-export OS_PASSWORD=password
-export OS_TENANT_NAME=admin
-export OS_VOLUME_API_VERSION=3
-export OS_USER_DOMAIN_ID=default
-EOF
- chown vagrant: ~vagrant/openrc
-
mkdir -p /etc/kolla/config/nova/
cat > /etc/kolla/config/nova/nova-compute.conf <<EOF
[libvirt]
diff --git a/doc/vagrant-dev-env.rst b/doc/vagrant-dev-env.rst
index 52960f9441..687ae61e89 100644
--- a/doc/vagrant-dev-env.rst
+++ b/doc/vagrant-dev-env.rst
@@ -130,7 +130,8 @@ Deploy multinode with::
Validate OpenStack is operational::
- source ~/openrc
+ kolla-ansible post-deploy
+ source /etc/kolla/admin-openrc.sh
openstack user list
Or navigate to http://10.10.10.254/ with a web browser.