diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-01 11:38:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-01 11:38:52 +0000 |
| commit | fc329bcce2c6f1e127fec7bcb029c2e45e26de0d (patch) | |
| tree | c7ea9641f97990fc370a8573f8ff2e953ad6e856 | |
| parent | 23646eb07fe10df2e7109f985b4d84f8f9ba7ede (diff) | |
| parent | ffa552b2828fab451ee37fa3889a65ffe6b0158e (diff) | |
| download | kolla-fc329bcce2c6f1e127fec7bcb029c2e45e26de0d.tar.gz kolla-fc329bcce2c6f1e127fec7bcb029c2e45e26de0d.zip | |
Merge "Update the way of loading the admin-openrc.sh file"
| -rw-r--r-- | doc/vagrant-dev-env.rst | 2 | ||||
| -rwxr-xr-x | tools/deploy_aio.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/vagrant-dev-env.rst b/doc/vagrant-dev-env.rst index 8ed3d3e4c..6e6267797 100644 --- a/doc/vagrant-dev-env.rst +++ b/doc/vagrant-dev-env.rst @@ -149,7 +149,7 @@ On Ubuntu 14.04 or later:: Validate OpenStack is operational:: kolla-ansible post-deploy - source /etc/kolla/admin-openrc.sh + . /etc/kolla/admin-openrc.sh openstack user list Or navigate to http://172.28.128.254/ with a web browser. diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh index bddb34e5c..1ae96d78f 100755 --- a/tools/deploy_aio.sh +++ b/tools/deploy_aio.sh @@ -29,7 +29,7 @@ function copy_logs { function sanity_check { # Wait for service ready sleep 15 - source /etc/kolla/admin-openrc.sh + . /etc/kolla/admin-openrc.sh # TODO(Jeffrey4l): Restart the memcached container to cleanup all cache. # Remove this after this bug is fixed # https://bugs.launchpad.net/oslo.cache/+bug/1590779 |