diff options
| author | Martin André <m.andre@redhat.com> | 2016-03-11 17:14:03 +0900 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2016-03-11 17:14:03 +0900 |
| commit | 29b4e8756da67e65c928d8cec6afff998b74a863 (patch) | |
| tree | bcd6aef0d801feb1fd39cf49fe75acde73b00cb7 | |
| parent | 19bdb0934eff63fb3349173782e4c6631b19a7f5 (diff) | |
| download | kolla-29b4e8756da67e65c928d8cec6afff998b74a863.tar.gz kolla-29b4e8756da67e65c928d8cec6afff998b74a863.zip | |
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
| -rw-r--r-- | dev/vagrant/centos-bootstrap.sh | 11 | ||||
| -rw-r--r-- | dev/vagrant/ubuntu-bootstrap.sh | 11 | ||||
| -rw-r--r-- | 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 0aee56eb4..9030a2cdb 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 feeb7141f..b57fd1194 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 52960f944..687ae61e8 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. |