aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-24 10:52:51 +0000
committerGerrit Code Review <review@openstack.org>2015-11-24 10:52:51 +0000
commitd0c277bb4f87f0102552e6bff79395f47dcd6ee1 (patch)
tree7998d1c69db9fea461856dfa0e5e12cd80cbee8d
parent260ad5c196617b8a5fde9c23a6cb4884928ac750 (diff)
parent46673b81c154a018dca40f40dd527b3488b652dc (diff)
downloadkolla-d0c277bb4f87f0102552e6bff79395f47dcd6ee1.tar.gz
kolla-d0c277bb4f87f0102552e6bff79395f47dcd6ee1.zip
Merge "Create openrc file on the deploy node"
-rw-r--r--ansible/post-deploy.yml9
-rw-r--r--ansible/roles/common/templates/admin-openrc.sh.j28
-rw-r--r--doc/quickstart.rst9
3 files changed, 23 insertions, 3 deletions
diff --git a/ansible/post-deploy.yml b/ansible/post-deploy.yml
new file mode 100644
index 000000000..76913dc54
--- /dev/null
+++ b/ansible/post-deploy.yml
@@ -0,0 +1,9 @@
+---
+- name: Creating admin openrc file on the deploy node
+ hosts: all
+ tasks:
+ - template:
+ src: "roles/common/templates/admin-openrc.sh.j2"
+ dest: "{{ node_config_directory }}/admin-openrc.sh"
+ run_once: True
+ connection: local
diff --git a/ansible/roles/common/templates/admin-openrc.sh.j2 b/ansible/roles/common/templates/admin-openrc.sh.j2
new file mode 100644
index 000000000..9ab250f6a
--- /dev/null
+++ b/ansible/roles/common/templates/admin-openrc.sh.j2
@@ -0,0 +1,8 @@
+export OS_PROJECT_DOMAIN_ID=default
+export OS_USER_DOMAIN_ID=default
+export OS_PROJECT_NAME=admin
+export OS_TENANT_NAME=admin
+export OS_USERNAME=admin
+export OS_PASSWORD={{ keystone_admin_password }}
+export OS_AUTH_URL=http://{{ kolla_internal_address }}:{{ keystone_admin_port }}/v3
+export OS_IDENTITY_API_VERSION=3
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index 0950794af..f517c8add 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -464,12 +464,15 @@ kolla_internal_address.
Useful tools
-------------
-View tools/openrc-example for an example of an openrc that may be used with
-the environment. The following command will initialize an environment with a
-glance image and neutron networks:
+If run with the post-deploy.yml, an openrc file is created as
+\/etc\/kolla\/admin-openrc.sh on the deploy node. Or view tools/openrc-example
+for an example of an openrc that may be used with the environment. The
+following command will initialize an environment with a glance image and
+neutron networks:
::
+ source /etc/kolla/admin-openrc.sh
kolla/tools/init-runonce
Debugging Kolla