Skip to content
Snippets Groups Projects
Commit 29b4e875 authored by Martin André's avatar Martin André
Browse files

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
parent 19bdb093
No related branches found
No related tags found
No related merge requests found
...@@ -117,17 +117,6 @@ scp_if_ssh=True ...@@ -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]
......
...@@ -91,17 +91,6 @@ scp_if_ssh=True ...@@ -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]
......
...@@ -130,7 +130,8 @@ Deploy multinode with:: ...@@ -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.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment