launchpad-1459816+.patch revision 6033
48c0c81cd6fabac9d3386406d97633780365b839coarThe following in-house jumbo patch constitutes the upstream changes in
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddardKilo for the following changesets
2a6c49cfaef5979a5a06098f3ce987cd76769409manoj fa43b6f6d196ea7780de4530c1d59bd43bc0b6de
2a6c49cfaef5979a5a06098f3ce987cd76769409manoj 82449dd550b4724fc90e1f2c16ae5f3237eebd25
d8028365066fca602bf35d014530a1802114378crbb e614b299408b65a6558888b1f4930a9b641f1920
c25203fdca093d4504c51b4cd974ff60d5aa4fb1wrowe 6cd2e5eccdad0005c4a69d85aa6918cfc33062c5
c25203fdca093d4504c51b4cd974ff60d5aa4fb1wrowe 19f3ad9eca9e9d73e6a147b06d66d4dcb66d2934
d89c116f82699294ca744125723651c554bc5925wrowewhich address a number of issues with tools/sample_data.sh including
4214e98fc9045e5010e66f9a967bd6d68f40d342aaronswitching from the deprecated keystoneclient to the new openstackclient
91cacb801f6c0215b38322f6d2fc58cbfedfecfbjerenkrantzcommit fa43b6f6d196ea7780de4530c1d59bd43bc0b6de
91cacb801f6c0215b38322f6d2fc58cbfedfecfbjerenkrantzAuthor: phil-hopkins-a <phil.hopkins@rackspace.com>
df14f0d3a5191cdd7c4bb5b03acd135d43a6f51brbbDate: Thu May 28 15:34:57 2015 -0500
ab71b233b3a36489e44a7b061c48293be0b17788jwoolley updates sample_data script to use the new openstack commands
571760de5e60c0b459cb11be45507b923cd023eejwoolley Cleans up the sample_data script to replace the keystoneclient commands
9180a5933673ffb1af633c255ceee029340f3b1erbb with the new openstackclient commands
9bd71e35f5d26d26d23fe3a677401828e842ed72wrowe Change-Id: Id68ff2b466e582a0c2f4418d173f7d63c14f5f37
2900ab946a2d76b73a14cebfe2985d253f01c967stoddard Closes-Bug: #1459816
a548c09e6a8ca1b059d0e93b5256c6ccb2b3c3cdrbbcommit 82449dd550b4724fc90e1f2c16ae5f3237eebd25
a548c09e6a8ca1b059d0e93b5256c6ccb2b3c3cdrbbAuthor: Eric Brown <browne@vmware.com>
b876b7bcf0ce3d232da723246d709e8dbbfe8762rbbDate: Sun Jul 12 22:47:27 2015 -0700
35330e0d79ceb8027223bbb8330a381b1f989d6etrawick Replace reference of ksc with osc
8dd4618c4709236b4ea297d7250d282e463ce2d8rbb The leading comment in sample_data.sh still references the old
09bd86d0db1114ee23eda0a6eb76ca055877a1cftrawick python-keystoneclient when its python-openstackclient that is
2deb319e6b3de239f45c16a3e9e836d44f1f7108rbb used to populate sample data.
70f6f32765cfaadd6da8de6f0fea97ddd72d8fadmanoj This patch also makes a minor fix of the Swift service description.
af4c982a7cf4515f124935f99a329744035fc699slive Change-Id: Ie4f5729dcc0b3a6164470d11ba91ddaaec0bb022
af4c982a7cf4515f124935f99a329744035fc699slivecommit e614b299408b65a6558888b1f4930a9b641f1920
af4c982a7cf4515f124935f99a329744035fc699sliveAuthor: Ghe Rivero <ghe.rivero@hp.com>
af4c982a7cf4515f124935f99a329744035fc699sliveDate: Sat Aug 1 05:00:05 2015 +0200
4b62424416882687387923b3130b96241503cbe0jerenkrantz Update exported variables for openstack client
f9b8e29cfca92cf0a996e8ab17fa1a1f447cecc7stoddard When using openstack client to populate an initial keystone
5ca8e11fadb6f7a8d9d0367c1800205c99d4bcd6jerenkrantz deployment, instead of the former keystone client, the env.
45b0e1c775c1cfed6473c9e5304179ccb9609f53stoddard variables needed are OS_TOKEN and OS_URL instead of the
dbec4658981e4f9127e8676457c28d42932be7cdtrawick previous OS_SERVICE_TOKEN and OS_SERVICE_ENDPOINT
8c8fbb8546af54582539898be704411a60058d85trawick Change-Id: I79dcd56896945267cf1c8ff4378ffff63048e155
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantzcommit 6cd2e5eccdad0005c4a69d85aa6918cfc33062c5
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantzAuthor: Ghe Rivero <ghe.rivero@hp.com>
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewroweDate: Sat Aug 1 05:16:28 2015 +0200
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantz Missing ADMIN_USER in sample_data.sh
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe When moving from keystone to openstack client, the initialization of
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantz the ADMIN_USER variable was removed, making the script to fail.
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantz Change-Id: Iee2d5b1cbed6c93e335a4b4dbad3034a2f8e29ed
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantzcommit 19f3ad9eca9e9d73e6a147b06d66d4dcb66d2934
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantzAuthor: Ghe Rivero <ghe.rivero@hp.com>
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantzDate: Sun Aug 2 17:57:37 2015 +0200
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantz Create neutron service in sample_data.sh
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantz With the addition of Neutron to the sample_data.sh script, all services
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantz required by the compute starter kit tag [1] are created (plus swift and ec2
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe compatible credentials)
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantz [1] http://governance.openstack.org/reference/tags/compute_starter_kit.html
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantz Change-Id: Iebc4f6b005e0466fe60691d964c7dea0e0eee947
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantz--- keystone-2015.1.2/doc/source/developing.rst.~1~ 2015-10-13 10:18:02.000000000 -0700
f4cb04eb78da02a38fcdd87489dc7b660107d55fjerenkrantz+++ keystone-2015.1.2/doc/source/developing.rst 2016-02-05 23:16:41.873683648 -0800
1b3f48fd6b1ccb8745f908e40156c5a85ca3c347jerenkrantz@@ -75,6 +75,7 @@ place:
829b09b6ec9b6d69916813ef7205469bddc9f8a9gregames .. _`python-keystoneclient`: https://github.com/openstack/python-keystoneclient
829b09b6ec9b6d69916813ef7205469bddc9f8a9gregames+.. _`openstackclient`: https://git.openstack.org/cgit/openstack/python-openstackclient
8c8fbb8546af54582539898be704411a60058d85trawick If the above commands result in a ``KeyError``, or they fail on a
8c8fbb8546af54582539898be704411a60058d85trawick ``.pyc`` file with the message, ``You can only have one Python script per
8c8fbb8546af54582539898be704411a60058d85trawick@@ -158,18 +159,24 @@ data for use with keystone:
f9b8e29cfca92cf0a996e8ab17fa1a1f447cecc7stoddard .. code-block:: bash
a23b1c5a74208b03884c09a6f9dd5d6c97fa6415trawick- $ OS_SERVICE_TOKEN=ADMIN tools/with_venv.sh tools/sample_data.sh
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe+ $ OS_TOKEN=ADMIN tools/with_venv.sh tools/sample_data.sh
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe Notice it requires a service token read from an environment variable for
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe authentication. The default value "ADMIN" is from the ``admin_token``
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe option in the ``[DEFAULT]`` section in ``etc/keystone.conf``.
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe Once run, you can see the sample data that has been created by using the
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe-`python-keystoneclient`_ command-line interface:
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe+`openstackclient`_ command-line interface:
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe .. code-block:: bash
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe- $ tools/with_venv.sh keystone --os-token ADMIN --os-endpoint http://127.0.0.1:35357/v2.0/ user-list
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe+ $ tools/with_venv.sh openstack --os-token ADMIN --os-url http://127.0.0.1:35357/v2.0/ user list
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe+The `openstackclient`_ can be installed using the following:
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe+.. code-block:: bash
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe+ $ tools/with_venv.sh pip install python-openstackclient
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe Filtering responsibilities between controllers and drivers
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe ----------------------------------------------------------
638a9edaf48cf003cd40ac25ee8c25f572107414stoddard--- keystone-2015.1.2/tools/sample_data.sh.~1~ 2015-10-13 10:18:02.000000000 -0700
638a9edaf48cf003cd40ac25ee8c25f572107414stoddard+++ keystone-2015.1.2/tools/sample_data.sh 2016-02-05 23:16:41.875371581 -0800
638a9edaf48cf003cd40ac25ee8c25f572107414stoddard@@ -14,14 +14,14 @@
83d91d60d00dc345bfbcbc48ff206db4a6b23b2eaaron # License for the specific language governing permissions and limitations
83d91d60d00dc345bfbcbc48ff206db4a6b23b2eaaron # under the License.
db2d668e6233d8949b35ee7f9f42f444758f9ce9rbb-# Sample initial data for Keystone using python-keystoneclient
db2d668e6233d8949b35ee7f9f42f444758f9ce9rbb+# Sample initial data for Keystone using python-openstackclient
db2d668e6233d8949b35ee7f9f42f444758f9ce9rbb # This script is based on the original DevStack keystone_data.sh script.
db2d668e6233d8949b35ee7f9f42f444758f9ce9rbb # It demonstrates how to bootstrap Keystone with an administrative user
db2d668e6233d8949b35ee7f9f42f444758f9ce9rbb-# using the OS_SERVICE_TOKEN and OS_SERVICE_ENDPOINT environment variables
1ea5221b240a8b41a07c6fb04aab5a73adcddabfaaron-# and the administrative API. It will get the admin_token (OS_SERVICE_TOKEN)
1ea5221b240a8b41a07c6fb04aab5a73adcddabfaaron-# and admin_port from keystone.conf if available.
1ea5221b240a8b41a07c6fb04aab5a73adcddabfaaron+# using the OS_TOKEN and OS_URL environment variables and the administrative
1ea5221b240a8b41a07c6fb04aab5a73adcddabfaaron+# API. It will get the admin_token (OS_TOKEN) and admin_port from
a12f07383f9c286519fe88f559187148d5bd1c16aaron+# keystone.conf if available.
1ea5221b240a8b41a07c6fb04aab5a73adcddabfaaron # Disable creation of endpoints by setting DISABLE_ENDPOINTS environment variable.
5d12baef135b5d3cb94745e007a1575398469724jerenkrantz # Use this with the Catalog Templated backend.
5d12baef135b5d3cb94745e007a1575398469724jerenkrantz@@ -36,17 +36,25 @@
5d12baef135b5d3cb94745e007a1575398469724jerenkrantz # service nova admin
5d12baef135b5d3cb94745e007a1575398469724jerenkrantz # service ec2 admin
5d12baef135b5d3cb94745e007a1575398469724jerenkrantz # service swift admin
5d12baef135b5d3cb94745e007a1575398469724jerenkrantz+# service neutron admin
5d12baef135b5d3cb94745e007a1575398469724jerenkrantz # By default, passwords used are those in the OpenStack Install and Deploy Manual.
5d12baef135b5d3cb94745e007a1575398469724jerenkrantz # One can override these (publicly known, and hence, insecure) passwords by setting the appropriate
5d12baef135b5d3cb94745e007a1575398469724jerenkrantz # environment variables. A common default password for all the services can be used by
5d12baef135b5d3cb94745e007a1575398469724jerenkrantz # setting the "SERVICE_PASSWORD" environment variable.
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz+# Test to verify that the openstackclient is installed, if not exit
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz+type openstack >/dev/null 2>&1 || {
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz+ echo >&2 "openstackclient is not installed. Please install it to use this script. Aborting."
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz NOVA_PASSWORD=${NOVA_PASSWORD:-${SERVICE_PASSWORD:-nova}}
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz GLANCE_PASSWORD=${GLANCE_PASSWORD:-${SERVICE_PASSWORD:-glance}}
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz EC2_PASSWORD=${EC2_PASSWORD:-${SERVICE_PASSWORD:-ec2}}
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz SWIFT_PASSWORD=${SWIFT_PASSWORD:-${SERVICE_PASSWORD:-swiftpass}}
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz+NEUTRON_PASSWORD=${NEUTRON_PASSWORD:-${SERVICE_PASSWORD:-neutron}}
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz CONTROLLER_PUBLIC_ADDRESS=${CONTROLLER_PUBLIC_ADDRESS:-localhost}
b865daaa4ef731a7066ee6d97e2aae36c7743939jerenkrantz CONTROLLER_ADMIN_ADDRESS=${CONTROLLER_ADMIN_ADDRESS:-localhost}
dc098c7ce5d36179c504d09fc722d190683d0262aaron@@ -79,14 +87,14 @@ if [[ -r "$KEYSTONE_CONF" ]]; then
dc098c7ce5d36179c504d09fc722d190683d0262aaron-export OS_SERVICE_TOKEN=${OS_SERVICE_TOKEN:-$CONFIG_SERVICE_TOKEN}
dc098c7ce5d36179c504d09fc722d190683d0262aaron-if [[ -z "$OS_SERVICE_TOKEN" ]]; then
dc098c7ce5d36179c504d09fc722d190683d0262aaron+export OS_TOKEN=${OS_TOKEN:-$CONFIG_SERVICE_TOKEN}
364dfd4527e6ce37b828a42e2c0bbdf9ba19a9b8gregames+if [[ -z "$OS_TOKEN" ]]; then
364dfd4527e6ce37b828a42e2c0bbdf9ba19a9b8gregames echo "No service token found."
dc098c7ce5d36179c504d09fc722d190683d0262aaron- echo "Set OS_SERVICE_TOKEN manually from keystone.conf admin_token."
0bcb1fe39dfaacf9745b6633f5cc9ebc8e2596caaaron+ echo "Set OS_TOKEN manually from keystone.conf admin_token."
0bcb1fe39dfaacf9745b6633f5cc9ebc8e2596caaaron-export OS_SERVICE_ENDPOINT=${OS_SERVICE_ENDPOINT:-http://$CONTROLLER_PUBLIC_ADDRESS:${CONFIG_ADMIN_PORT:-35357}/v2.0}
0bcb1fe39dfaacf9745b6633f5cc9ebc8e2596caaaron+export OS_URL=${OS_URL:-http://$CONTROLLER_PUBLIC_ADDRESS:${CONFIG_ADMIN_PORT:-35357}/v2.0}
33f5961d34a8b5390cebad0543b3ebe67830e5d7jerenkrantz function get_id () {
33f5961d34a8b5390cebad0543b3ebe67830e5d7jerenkrantz echo `"$@" | grep ' id ' | awk '{print $4}'`
33f5961d34a8b5390cebad0543b3ebe67830e5d7jerenkrantz@@ -95,141 +103,160 @@ function get_id () {
33f5961d34a8b5390cebad0543b3ebe67830e5d7jerenkrantz # Default tenant
ff42f83cbf31893bcde9712332a8e5ee970f6a74trawick-DEMO_TENANT=$(get_id keystone tenant-create --name=demo \
ff42f83cbf31893bcde9712332a8e5ee970f6a74trawick- --description "Default Tenant")
33f5961d34a8b5390cebad0543b3ebe67830e5d7jerenkrantz+openstack project create demo \
54e1babd5a5a56c576eeeace54110150769cc916coar+ --description "Default Tenant"
54e1babd5a5a56c576eeeace54110150769cc916coar-ADMIN_USER=$(get_id keystone user-create --name=admin \
54e1babd5a5a56c576eeeace54110150769cc916coar- --pass="${ADMIN_PASSWORD}")
54e1babd5a5a56c576eeeace54110150769cc916coar+openstack user create admin --project demo \
54e1babd5a5a56c576eeeace54110150769cc916coar+ --password "${ADMIN_PASSWORD}"
54e1babd5a5a56c576eeeace54110150769cc916coar-ADMIN_ROLE=$(get_id keystone role-create --name=admin)
54e1babd5a5a56c576eeeace54110150769cc916coar+openstack role create admin
54e1babd5a5a56c576eeeace54110150769cc916coar-keystone user-role-add --user-id $ADMIN_USER \
54e1babd5a5a56c576eeeace54110150769cc916coar- --role-id $ADMIN_ROLE \
54e1babd5a5a56c576eeeace54110150769cc916coar- --tenant-id $DEMO_TENANT
949aa7bba7f804faa8e6b08cad42a98fc0255d85jerenkrantz+openstack role add --user admin \
949aa7bba7f804faa8e6b08cad42a98fc0255d85jerenkrantz+ --project demo\
949aa7bba7f804faa8e6b08cad42a98fc0255d85jerenkrantz # Service tenant
e0427bf8e52a8fb920cb8b6adb5cdb3b6535b7fecoar-SERVICE_TENANT=$(get_id keystone tenant-create --name=service \
07021d9f405849228b859d9fb4b877f20e4fbba3jerenkrantz- --description "Service Tenant")
07021d9f405849228b859d9fb4b877f20e4fbba3jerenkrantz+openstack project create service \
07021d9f405849228b859d9fb4b877f20e4fbba3jerenkrantz+ --description "Service Tenant"
f126ee03179eb54308118f1ec3de5a7b461685d8aaron+openstack user create glance --project service\
f126ee03179eb54308118f1ec3de5a7b461685d8aaron+ --password "${GLANCE_PASSWORD}"
f126ee03179eb54308118f1ec3de5a7b461685d8aaron+openstack role add --user glance \
f126ee03179eb54308118f1ec3de5a7b461685d8aaron+ --project service \
f126ee03179eb54308118f1ec3de5a7b461685d8aaron+openstack user create nova --project service\
f126ee03179eb54308118f1ec3de5a7b461685d8aaron+ --password "${NOVA_PASSWORD}"
f126ee03179eb54308118f1ec3de5a7b461685d8aaron+openstack role add --user nova \
f126ee03179eb54308118f1ec3de5a7b461685d8aaron+ --project service \
f126ee03179eb54308118f1ec3de5a7b461685d8aaron+openstack user create ec2 --project service \
109faf633e12ab0bbdd602c7addc795cce59e8addreid+ --password "${EC2_PASSWORD}"
109faf633e12ab0bbdd602c7addc795cce59e8addreid+openstack role add --user ec2 \
109faf633e12ab0bbdd602c7addc795cce59e8addreid+ --project service \
109faf633e12ab0bbdd602c7addc795cce59e8addreid-GLANCE_USER=$(get_id keystone user-create --name=glance \
109faf633e12ab0bbdd602c7addc795cce59e8addreid- --pass="${GLANCE_PASSWORD}")
109faf633e12ab0bbdd602c7addc795cce59e8addreid+openstack user create swift --project service \
109faf633e12ab0bbdd602c7addc795cce59e8addreid+ --password "${SWIFT_PASSWORD}" \
109faf633e12ab0bbdd602c7addc795cce59e8addreid-keystone user-role-add --user-id $GLANCE_USER \
109faf633e12ab0bbdd602c7addc795cce59e8addreid- --role-id $ADMIN_ROLE \
109faf633e12ab0bbdd602c7addc795cce59e8addreid- --tenant-id $SERVICE_TENANT
4ca13a5e126946272f02637e268a8e09193c553ecoar-NOVA_USER=$(get_id keystone user-create --name=nova \
4ca13a5e126946272f02637e268a8e09193c553ecoar- --pass="${NOVA_PASSWORD}" \
4ca13a5e126946272f02637e268a8e09193c553ecoar- --tenant-id $SERVICE_TENANT)
48c0c81cd6fabac9d3386406d97633780365b839coar-keystone user-role-add --user-id $NOVA_USER \
48c0c81cd6fabac9d3386406d97633780365b839coar- --role-id $ADMIN_ROLE \
48c0c81cd6fabac9d3386406d97633780365b839coar- --tenant-id $SERVICE_TENANT
48c0c81cd6fabac9d3386406d97633780365b839coar-EC2_USER=$(get_id keystone user-create --name=ec2 \
48c0c81cd6fabac9d3386406d97633780365b839coar- --pass="${EC2_PASSWORD}" \
48c0c81cd6fabac9d3386406d97633780365b839coar- --tenant-id $SERVICE_TENANT)
4ca13a5e126946272f02637e268a8e09193c553ecoar-keystone user-role-add --user-id $EC2_USER \
b84f66c93f820824b1d5455181f55598b766319cwrowe- --role-id $ADMIN_ROLE \
b84f66c93f820824b1d5455181f55598b766319cwrowe- --tenant-id $SERVICE_TENANT
b84f66c93f820824b1d5455181f55598b766319cwrowe-SWIFT_USER=$(get_id keystone user-create --name=swift \
7fe18c15b669db9d191859695901dc4fcf3829dawrowe- --pass="${SWIFT_PASSWORD}" \
7fe18c15b669db9d191859695901dc4fcf3829dawrowe- --tenant-id $SERVICE_TENANT)
7fe18c15b669db9d191859695901dc4fcf3829dawrowe-keystone user-role-add --user-id $SWIFT_USER \
b84f66c93f820824b1d5455181f55598b766319cwrowe- --role-id $ADMIN_ROLE \
60d567a0c2aae815ee6fc20c0d65032bea52c92cwrowe- --tenant-id $SERVICE_TENANT
60d567a0c2aae815ee6fc20c0d65032bea52c92cwrowe+openstack role add --user swift \
60d567a0c2aae815ee6fc20c0d65032bea52c92cwrowe+ --project service \
48c0c81cd6fabac9d3386406d97633780365b839coar+openstack user create neutron --project service \
48c0c81cd6fabac9d3386406d97633780365b839coar+ --password "${NEUTRON_PASSWORD}" \
2fb49a1d25f38421a68d31b4cbb5d9293fdeafbewrowe+openstack role add --user neutron \
60d567a0c2aae815ee6fc20c0d65032bea52c92cwrowe+ --project service \
60d567a0c2aae815ee6fc20c0d65032bea52c92cwrowe # Keystone service
d180ec1b29106f4fec480ef7fcdb04df078010cerse-KEYSTONE_SERVICE=$(get_id \
d180ec1b29106f4fec480ef7fcdb04df078010cerse-keystone service-create --name=keystone \
3913a3b7e7c72ea11d05da36275db39c2dc39b68jwoolley- --type=identity \
3913a3b7e7c72ea11d05da36275db39c2dc39b68jwoolley- --description="Keystone Identity Service")
3913a3b7e7c72ea11d05da36275db39c2dc39b68jwoolley+openstack service create --name keystone \
57710387e669ee41fb211458efe09c4c73194a66jwoolley+ --description "Keystone Identity Service" \
3913a3b7e7c72ea11d05da36275db39c2dc39b68jwoolley if [[ -z "$DISABLE_ENDPOINTS" ]]; then
3913a3b7e7c72ea11d05da36275db39c2dc39b68jwoolley- keystone endpoint-create --region RegionOne --service-id $KEYSTONE_SERVICE \
d180ec1b29106f4fec480ef7fcdb04df078010cerse+ openstack endpoint create --region RegionOne \
19cbe4d7b7c931723e7249de6829bf965a1fee72stoddard --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:\$(public_port)s/v2.0" \
19cbe4d7b7c931723e7249de6829bf965a1fee72stoddard --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:\$(admin_port)s/v2.0" \
b187d568e1507d75139ebc13ca945b38fc05d55cstoddard- --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:\$(public_port)s/v2.0"
b187d568e1507d75139ebc13ca945b38fc05d55cstoddard+ --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:\$(public_port)s/v2.0" \
d2f8b010487ffa990a9c268df5a25579e7291bcdrbb # Nova service
a5ed555df952c85bc1b179f5981e8a6c54ba16e6stoddard-NOVA_SERVICE=$(get_id \
0bff2f28ef945280c17099c142126178a78e1e54manoj-keystone service-create --name=nova \
0bff2f28ef945280c17099c142126178a78e1e54manoj- --type=compute \
0bff2f28ef945280c17099c142126178a78e1e54manoj- --description="Nova Compute Service")
1e585ba09ea32272e63c4c39c35491e975d21d98stoddard+openstack service create --name=nova \
0bff2f28ef945280c17099c142126178a78e1e54manoj+ --description="Nova Compute Service" \
0bff2f28ef945280c17099c142126178a78e1e54manoj if [[ -z "$DISABLE_ENDPOINTS" ]]; then
9c09943bad734ebd5c7cc10bd6d63b75c4c6e056stoddard- keystone endpoint-create --region RegionOne --service-id $NOVA_SERVICE \
ff849e4163ed879288f0df15f78b6c9d278ec804fanf+ openstack endpoint create --region RegionOne \
ff849e4163ed879288f0df15f78b6c9d278ec804fanf --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:8774/v2/\$(tenant_id)s" \
447c6ce3ff08073c44f6785d5256271fcb877512wrowe --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:8774/v2/\$(tenant_id)s" \
e0427bf8e52a8fb920cb8b6adb5cdb3b6535b7fecoar- --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8774/v2/\$(tenant_id)s"
e0427bf8e52a8fb920cb8b6adb5cdb3b6535b7fecoar+ --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8774/v2/\$(tenant_id)s" \
6758b07b4b79f898b0f56375016cea7da0bfb495wrowe # Volume service
db3ccce11afac4fc1d4f51a65424412f7480c46cgstein-VOLUME_SERVICE=$(get_id \
dd4713dc5b186f4d1be7b88f86608fdb84cbe5d5gstein-keystone service-create --name=volume \
48c0c81cd6fabac9d3386406d97633780365b839coar- --type=volume \
48c0c81cd6fabac9d3386406d97633780365b839coar- --description="Nova Volume Service")
48c0c81cd6fabac9d3386406d97633780365b839coar+openstack service create --name=volume \
48c0c81cd6fabac9d3386406d97633780365b839coar+ --description="Cinder Volume Service" \
79d5106a9b65b956d646f5daae4b94bc79e315b8trawick if [[ -z "$DISABLE_ENDPOINTS" ]]; then
79d5106a9b65b956d646f5daae4b94bc79e315b8trawick- keystone endpoint-create --region RegionOne --service-id $VOLUME_SERVICE \
79d5106a9b65b956d646f5daae4b94bc79e315b8trawick+ openstack endpoint create --region RegionOne \
cf6bf6c34c936e6a6fe731dbce4a5c3c8bf8e9a3gstein --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:8776/v1/\$(tenant_id)s" \
cf6bf6c34c936e6a6fe731dbce4a5c3c8bf8e9a3gstein --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:8776/v1/\$(tenant_id)s" \
cf6bf6c34c936e6a6fe731dbce4a5c3c8bf8e9a3gstein- --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8776/v1/\$(tenant_id)s"
6fa71a1bd8c61518b05f5798a7a1594c270e78afrbb+ --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8776/v1/\$(tenant_id)s" \
14cccaddba3a9263cf0d0ddc311e18f3e3dc9b0fgstein # Image service
14cccaddba3a9263cf0d0ddc311e18f3e3dc9b0fgstein-GLANCE_SERVICE=$(get_id \
823c303d33c9e637a83d82208bcbafaf5f532d7bgstein-keystone service-create --name=glance \
823c303d33c9e637a83d82208bcbafaf5f532d7bgstein- --type=image \
e636eba7474e0010b5c7198af1c2fe5ad8652dbbmanoj- --description="Glance Image Service")
e636eba7474e0010b5c7198af1c2fe5ad8652dbbmanoj+openstack service create --name=glance \
e636eba7474e0010b5c7198af1c2fe5ad8652dbbmanoj+ --description="Glance Image Service" \
281da4c02cf40c663298ded7e4e5b913a8f8b814gstein if [[ -z "$DISABLE_ENDPOINTS" ]]; then
2f728b2e8555fee1b7cc11e886488692f2575fbddougm- keystone endpoint-create --region RegionOne --service-id $GLANCE_SERVICE \
2f728b2e8555fee1b7cc11e886488692f2575fbddougm+ openstack endpoint create --region RegionOne \
2f728b2e8555fee1b7cc11e886488692f2575fbddougm --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:9292" \
48c0c81cd6fabac9d3386406d97633780365b839coar- --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:9292"
60d567a0c2aae815ee6fc20c0d65032bea52c92cwrowe+ --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:9292" \
60d567a0c2aae815ee6fc20c0d65032bea52c92cwrowe # EC2 service
fdff4ace2701177219fe1c444f69242372423354aaron-EC2_SERVICE=$(get_id \
fdff4ace2701177219fe1c444f69242372423354aaron-keystone service-create --name=ec2 \
fdff4ace2701177219fe1c444f69242372423354aaron- --type=ec2 \
fdff4ace2701177219fe1c444f69242372423354aaron- --description="EC2 Compatibility Layer")
fdff4ace2701177219fe1c444f69242372423354aaron+openstack service create --name=ec2 \
fdff4ace2701177219fe1c444f69242372423354aaron+ --description="EC2 Compatibility Layer" \
27757f6699a924d4b493a1b6cceb27df27a43287dreid if [[ -z "$DISABLE_ENDPOINTS" ]]; then
27757f6699a924d4b493a1b6cceb27df27a43287dreid- keystone endpoint-create --region RegionOne --service-id $EC2_SERVICE \
27757f6699a924d4b493a1b6cceb27df27a43287dreid+ openstack endpoint create --region RegionOne \
21e01f13f717faeca3e498d7d9c9b4d3af98ae27trawick --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:8773/services/Cloud" \
21e01f13f717faeca3e498d7d9c9b4d3af98ae27trawick --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:8773/services/Admin" \
21e01f13f717faeca3e498d7d9c9b4d3af98ae27trawick- --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8773/services/Cloud"
21e01f13f717faeca3e498d7d9c9b4d3af98ae27trawick+ --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8773/services/Cloud" \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard # Swift service
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard-SWIFT_SERVICE=$(get_id \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard-keystone service-create --name=swift \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard- --type="object-store" \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard- --description="Swift Service")
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+openstack service create --name=swift \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+ --description="Swift Object Storage Service" \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+ object-store
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard if [[ -z "$DISABLE_ENDPOINTS" ]]; then
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard- keystone endpoint-create --region RegionOne --service-id $SWIFT_SERVICE \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+ openstack endpoint create --region RegionOne \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:8080/v1/AUTH_\$(tenant_id)s" \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:8080/v1" \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard- --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8080/v1/AUTH_\$(tenant_id)s"
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+ --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8080/v1/AUTH_\$(tenant_id)s" \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+# Neutron service
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+openstack service create --name=neutron \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+ --description="Neutron Network Service" \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+if [[ -z "$DISABLE_ENDPOINTS" ]]; then
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+ openstack endpoint create --region RegionOne \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+ --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:9696" \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+ --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:9696" \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+ --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:9696" \
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard # create ec2 creds and parse the secret and access key returned
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard-RESULT=$(keystone ec2-credentials-create --tenant-id=$SERVICE_TENANT --user-id=$ADMIN_USER)
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+ADMIN_USER=$(get_id openstack user show admin)
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard+RESULT=$(openstack ec2 credentials create --project service --user $ADMIN_USER)
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard ADMIN_ACCESS=`echo "$RESULT" | grep access | awk '{print $4}'`
ddd44b06b04507cae083c52451e28f54f0bdb5afstoddard ADMIN_SECRET=`echo "$RESULT" | grep secret | awk '{print $4}'`