openstack/kolla
Code Issues Proposed changes

Stop shipping broken openrc in vagrant

Browse Source 
Instead, rely on kolla-ansible post-deploy to generate a configuration
file with valid environment variables.

Change-Id: Ie62932afc96e2486410a1d4e14162a88b1733c22
Closes-Bug: #1555972
This commit is contained in:
Martin André 2016-03-11 17:14:03 +09:00
parent 19bdb0934e
commit 29b4e8756d
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dev/vagrant/centos-bootstrap.sh
View File

@ -117,17 +117,6 @@ scp_if_ssh=True
EOF EOF
chown vagrant: ~vagrant/.ansible.cfg 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/ mkdir -p /etc/kolla/config/nova/
cat > /etc/kolla/config/nova/nova-compute.conf <<EOF cat > /etc/kolla/config/nova/nova-compute.conf <<EOF
[libvirt] [libvirt]

11
dev/vagrant/ubuntu-bootstrap.sh
View File

@ -91,17 +91,6 @@ scp_if_ssh=True
EOF EOF
chown vagrant: ~vagrant/.ansible.cfg 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/ mkdir -p /etc/kolla/config/nova/
cat > /etc/kolla/config/nova/nova-compute.conf <<EOF cat > /etc/kolla/config/nova/nova-compute.conf <<EOF
[libvirt] [libvirt]

3
doc/vagrant-dev-env.rst
View File

@ -130,7 +130,8 @@ Deploy multinode with::
Validate OpenStack is operational:: Validate OpenStack is operational::
source ~/openrc kolla-ansible post-deploy
source /etc/kolla/admin-openrc.sh
openstack user list openstack user list
Or navigate to http://10.10.10.254/ with a web browser. Or navigate to http://10.10.10.254/ with a web browser.