Commit Graph

78 Commits

Author SHA1 Message Date
ba31305497 Move swift stuff out of keystone-data.sh
- Fixes bug 1199918.

Change-Id: I808bdd74a94c8e0ca126b9bee1bfd53eafa189a9
2013-07-11 00:01:03 +02:00
e3d3cb7598 Restore admin role to ceilometer user.
Fixes bug 1193004

The ceilometer user needs the admin role, so that the resources
(instances etc.) associated with all tenants are visible to the
ceilometer agents for metering purposes.

Change-Id: I4d8a88d2d88a11a4b408e0c68ef227ec2af2d822
2013-06-20 16:04:25 +01:00
1216b9fae9 Use service role instead of admin role for service users
Instead of using a full admin role to validate tokens just use the
service role. Change where possible, some services use the service user
for more then just token validation.

Fixes bug 1153789

Change-Id: I0801475b62a7b025fdd871f52d8606aa614d1a32
2013-06-04 17:44:41 -07:00
08fd641a19 Merge "Enable swift by default." 2013-03-15 14:41:54 +00:00
674df73405 Merge "Remove trailing slash from ceilometer endpoint URLs" 2013-03-06 19:09:08 +00:00
0c3a5584c6 Enable swift by default.
- Set by default SWIFT_REPLICAS to 1 since this is the most common use
  case when using it in devstack.
- If we have swift_replicas to 1 launch the object container account and
  proxy servers in foreground in screen.
- Allow any s- services if we have just 'swift' in service enabled
  instead of having to specify all s- services to enable swift. This will be
  removed in the future.
- Set object server starting at 6013 instead of 6010 to not conflict
  with remote ssh x11 forwarding.

Change-Id: I890b6953b70283bfa0927fff0cf5e92f3c08455b
2013-03-06 13:16:37 +01:00
21ddaac870 Remove trailing slash from ceilometer endpoint URLs
Fixes bug 1146794

Ensure the URLs configured for the ceilometer endpoint in the keystone
service catalog do not contain a trailing forward slash.

Otherwise, this leads to an extra forward slash in the URL paths
constructed by the ceilometer client, which in turn is problematic
for the v2 API.

Change-Id: I7d457efc6e01e4e955388f52a4907524052f0173
2013-03-05 12:40:59 +00:00
f3fd44c4be Revert "Enable swift by default."
This reverts commit 5a5cbf7274.

This breaks on a default openstack install on Ubuntu 12.10,
revert for now until this can be cleaned up to work out of the
box.

Change-Id: I185509cc30bd28e920cdab60fc92129949bd6b0d
2013-03-04 17:52:03 -05:00
5a5cbf7274 Enable swift by default.
- Set by default SWIFT_REPLICAS to 1 since this is the most common use
  case when using it in devstack.
- If we have swift_replicas to 1 launch the object container account and
  proxy servers in foreground in screen.
- Allow any s- services if we have just 'swift' in service enabled
  instead of having to specify all s- services to enable swift. This will be
  removed in the future.

Change-Id: I496f79e14f99bd7e9f2c7deee12a4b6e935c3a5b
2013-02-22 18:50:08 +01:00
66afb47cb9 Refactor quantum installation
* Move quantum installation to lib/quantum
* Refactor quantum configuration
* Move Quantum service account creation from keystone_data.sh to lib/quantum
* Define generic functions to install third party programs

* Minor cleanups related to Quantum
  * Kill dnsmasq which watches an interface 'ns-XXXXXX' in unstack.sh
  * Set default_floating_pool in nova.conf to make default flaoting pool
    work when PUBLIC_NETWORK_NAME is other than 'nova'
  * Make tempest work even when PRIVATE_NETWORK_NAME is other than 'private'

Change-Id: I4a6e7fcebfb11556968f53ab6a0e862ce16bb139
2012-12-26 23:41:38 +09:00
671c16e63a Move cinder account creation out of keystone_data.sh
Supports the coming HA/proxy configuration for Cinder

Change-Id: If2e08e45430dce895ed6bb1070612517a38ca4bc
2012-12-14 09:17:28 -06:00
d85f503e9a Merge "Add the role heat_stack_user for heat" 2012-12-12 18:17:22 +00:00
a0dce264d9 Move Nova account creation out of keystone_data.sh
Supports the coming HA/proxy configuration for Nova

Change-Id: I2baf1f51486537a1489f1376d38f5710bd96c314
2012-12-11 17:34:28 -06:00
053a5f8425 Add the role heat_stack_user for heat
Change-Id: I0c3ac92d222ff746baca817002821f109815fee9
2012-12-11 17:08:48 +13:00
d835de892a Move keystone account creation out of keystone_data.sh
keystone_data.sh is getting unwieldly and increasingly needs
configuration information for services.  Also need the ability
to manipulate HOST/IP information for hosts to handle service
HA/proxy configurations.

Begin moving the creation of service account information into
the service lib files, starting with the common accounts and
keystone itself.

Change-Id: Ie259f7b71983c4f4a2e33ab9c8a8e2b00238ba38
2012-12-03 13:47:27 -06:00
5f9d6a4d0e Merge "Add ResellerAdmin role to ceilometer user." 2012-11-30 20:38:46 +00:00
a70248dd67 Merge "remove hard tabs from keystone_data.sh" 2012-11-30 00:29:51 +00:00
a61eb6af5d remove hard tabs from keystone_data.sh
hard tabs somehow snuck into keystone_data.sh, noticed
in an unrelated review. Remove for consistency.

Change-Id: I04f3b4597fd3629c7f123588c512832a67228597
2012-11-29 14:51:34 -05:00
901eed70b4 Add ResellerAdmin role to ceilometer user.
For the sake of swift metering, 'ceilometer' user needs to be a
ResellerAdmin for tenant 'service'.

Change-Id: I65b3bdedddded9d5f3bac5c5d714288800ffa8b6
2012-11-29 15:39:25 +01:00
766ae34261 Creates nova endpoint when n-api is enabled.
Fixes bug 1081975

Nova endpoint in keystone was registered if n-cpu is enabled. However it is
a usual case where n-cpu runs on a different host in multi-node setup and
it results in no endpoint for nova. n-api is a better condition since nova-api
and keystone usually run on a same host.

Change-Id: Ic097e1c3bd30798d9d3c5fb76023fbdb3ae189d9
2012-11-22 21:27:18 +09:00
6fd2811726 Remove support for nova-volume
* nova-volume has been removed in Grizzly
* part of delete-nova-volume

Change-Id: Iba91d69950767823d77aaaa93243b0f476dbb04d
2012-11-14 13:21:58 -08:00
4a2b1c6611 Finish configuring ceilometer authentication
Copy the policy.json file for ceilometer into place
and configure the API service to find it.

Create a service user for ceilometer when the service
is enabled.

Use the service user for the admin_user and admin_password
in the ceilometer config file so the middleware can
verify tokens.

Change-Id: I39be13da0c86704d35e0ce3dc3d27fd38d787058
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
2012-11-05 06:54:36 -05:00
f36afe587b Add ceilometer-api to service catalog
This fixes bug #1060344

Change-Id: I0fee6b4660f564c4f8d62274ed52fa4b367f67da
Signed-off-by: Julien Danjou <julien@danjou.info>
2012-10-24 14:01:13 +02:00
bb421bed58 Configure and launch Heat REST API.
This is a REST API in the same style as other OpenStack APIs.

This also creates a new endpoint for the REST API which uses the
serivce type 'orchestration'. The old endpoint now has the service
type 'cloudformation'.

This matches the pattern where the native openstack API gets a
generic service type while the emulated EC2 API gets a specific
type (eg, object-store, s3).

There will be breakage for the time period where only one of this
change and https://review.openstack.org/#/c/14263/ are approved,
since keystone will have the incorrect service type for that period.

Change-Id: I6a0d51a63da8017d375b4c065c4c9079dfca8fe3
2012-10-10 13:32:16 +13:00
36cf7ee141 Fix the variable used for the service_id of the heat endpoint
Change-Id: I0c8190713722e3bcef19e94629d4f0d4fbfaa8fa
2012-09-18 08:26:23 +12:00
e279021010 heat had it's api split into two binaries (cfn & cloudwatch)
- Rename heat-api to heat-api-cfn
- Add heat-api-cloudwatch
- Also removed unused heat-engine-paste.ini file.
- Fix the path to the conf dir (etc/heat not etc/)

Change-Id: I9b2c7c5cd7052d5eb6d730833c65812c2f8a0ee1
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-09-11 11:24:09 +10:00
8d6c9bcabb Fix keystone_data.sh to match default_catalog.templates
Endpoint creating in keystone_data.sh tends to drift because
KEYSTONE_CATALOG_BACKEND=sql is not the default.

This patch should bring them closer together, and fix a problem I was having
with keystone auth

Change-Id: Ifac57b8e69234975d1ff65ace72d46d3a5808119
2012-09-11 10:07:26 +12:00
bfdad75eda Add support to optionally launch the heat service.
This allows the heat service to be started as a devstack service.

Heat is disabled by default, and can be enabled with this in your localrc:
ENABLED_SERVICES+=,heat

There is now a repo of heat-enabled images here:
https://github.com/heat-api/prebuilt-jeos-images/downloads

These can be added to the IMAGE_URLS in your localrc.

After devstack is launched, a template can be invoked with:
nova keypair-add --pub_key $HOME/.ssh/id_rsa.pub heat_key
heat -d create wordpress \
--template-file=../heat/templates/WordPress_Single_Instance.template \
--parameters="InstanceType=m1.tiny;DBUsername=wpuser;DBPassword=wppassword;\
KeyName=heat_key;LinuxDistribution=F16"

Change-Id: I07591295eb2b9eb7868b1577dd3c24b19812a689
2012-08-22 17:02:21 +12:00
d55509d46e Use c-api for service when creating cinder user.
- cinder is not a service but c-api is.

Change-Id: I580fe91216d3fa066120dc774811bfe08119ca02
2012-07-20 15:00:02 +00:00
1cdf5fa4b5 Register cinder when using sql keystone catalog.
* Fixes bug #1020735

Change-Id: Ibd954cdda3c855800ae1080950c62dd71b094a01
2012-07-03 13:57:39 -07:00
6b93f829c1 Merge "Support sql service catalog backend" 2012-06-27 19:34:33 +00:00
67787e6b4c Add cinder support
* using the new functional pattern: cinder_XXX functions are in
  lib/cinder
* enable with 'c-api,c-sch,c-vol' in ENABLED_SERVICES, n-vol is still the default
* exercises/volumes.sh runs for cinder and n-vol
* move config to /etc/cinder
* change volume_group to stack-volumes; this also renames the backing file
  to /opt/stack/data/stack-volumes-backing-file.
* removes osapi_volume from nova.conf enabled_apis
* integrates cinder + keystone
* launches c-sch
* tweaks for multi node
* move enabled_apis substitution to init_cinder

18Jun2010
* restored & rebased
* update setup.py to use setup_develop() in lib/cinder

Change-Id: I1e1aa4387031c56e4fa239eb73bea2af8cef0e38
2012-06-20 14:11:19 -06:00
3f7c06f5aa Support sql service catalog backend
* Add KEYSTONE_CATALOG_BACKEND to select 'sql' or 'template'
  'template' is the default
* Add service creation to keystone_data.sh

Rebased and re-submitted

Fixes bug 966457

Change-Id: Id24fbdeba3de11537559e24b72571ec92ab44750
2012-06-19 14:25:05 +00:00
218a4fa532 Merge "Changed --user to --user_id and --role to --role_id in the keystone client for consistency. Need to update keystone calls here." 2012-05-16 18:35:43 +00:00
b297d2d0a8 Fixes LP #996571 - Alternate Tempest user
Adds an alternate user to Keystone for Tempest

Tempest has a number of tests that are skipped if
the compute.alt_username is the same as compute.username
or None. Here, we modify files/keystone_data.sh to add
an additional regular user called alt_demo if Tempest
is enabled in stackrc. We also make corresponding changes
to the tools/configure_tempest.sh script to make use
of this alternate user credential

Change-Id: I551f3b378f843c62fffcf6effa916056708d54d3
2012-05-10 11:25:39 -04:00
a143e73caf Changed --user to --user_id and --role to --role_id in the keystone client for consistency. Need to update keystone calls here.
This change should be applied after [bug/994744 b7fe11c] in python-keystoneclient.

Fixes bug 994744.

Change-Id: I13e643f8552d86ed0bf92799271899f777bde9b2
2012-05-08 22:13:08 +00:00
77b0e1d8ff Converts bundle exercise to use swift/s3
- Fix keystone s3token configuration (in admin api not public api).
- Set s3 service in keystone to swift if installed.
- Fixes a bug in bundle.sh
- Adds config options for nova to use swift as s3 store

Change-Id: Ic2fca5aba06a25c0b3a74f1e97d062390a8e2ab1
2012-03-15 20:59:45 +00:00
ae604985e7 Remove references to deprecated ec2 authorizor.
* remove replace_pipeline
 * removes references to sysadmin and netadmin roles
 * removes references to admin ec2 api
 * fixes bug 953744
 * related fix in nova: https://review.openstack.org/#change,5024

Change-Id: I8792dae0157b8596a5f946670742411781fe47c0
2012-03-13 16:10:56 -07:00
edf59ca443 Merge "Remove calls to service-create in devstack for now." 2012-03-10 11:13:39 +00:00
0bd2410d46 Move all EC2 cred creation to eucarc
* Remove credential creation from files/keystone_data.sh
* Remove EC2 cert setup from openrc
* Remove sourcing of ec2rc from stackrc
* Collect the above in eucarc
* Allow rc files to be sourced from other directories; based on Chmouel's
  4881 proposal but is simpler and doesn't actually change the directory
* Create S3 endpoint
* Get EC2 and S3 endpoints from Keystone service catalog
* Add EC2 credential checks to exercises/client-env.sh
* exercises/bundle.sh and exercises/euca.sh use eucarc

Updates:
* remove readlink -f to stay bash 3 compatible
* use service catalog
* create S3 endpoint

Fixes bug 949528

Change-Id: I58caea8cecbbd10661779bc2d150d241f4a5822e
2012-03-09 21:41:00 -06:00
e2d139b8c8 Remove calls to service-create in devstack for now.
* The recommended backend for essex is the template backend.
 * Fixes bug 950213

Change-Id: I2f8bc9f74cee2d783cbadcc1d4d4e674ddb905b9
2012-03-09 15:49:53 -08:00
b7d1fbbe20 Cleanup keystone_data.sh
* Remove the compatibility code for older keystone client
* Reformat commands similar to keystone sample_data.sh
* Improve documentation

Change-Id: I2fc544555a1b936d28f11c3c4eaaf885b2cb6d17
2012-03-05 17:43:10 -06:00
b328838104 Add service account configuration
* Use username/password instead of service token for service auth to Keystone
* Updates files/glance-*-paste.ini and files/swift/proxy-server.conf
* keystone_data.sh creates 'service' tenant, 'nova' and 'glance' users
  ('swift' and 'quantum' if those services are enabled)
* Uses $SERVICE_PASSWORD for the service auth password. There is no default;
  to default to $ADMIN_PASSWORD, place the assignment in localrc.

Fixes bug 942983

Change-Id: If78eed1b509a9c1e8441bb4cfa095da9052f9395
2012-02-29 16:22:10 -06:00
5f9473e8b9 Add nova-volume endpoint to service catalog
Change-Id: Id04568d7f8eecc8c8e7c1a92990d37a46923caf7
2012-02-24 02:10:22 +00:00
f4565c4694 Make keystone_data.sh handle existing and updated keystone client
Keystone client commands and options have been normalized and
keystone_data.sh needs to support both versions for a transition
period.

The merge prop for the updated keystone client is
https://review.openstack.org/4375

Necessary for bug 396422

Also fix an intermittent problem extacting IDs from command output.

Change-Id: Ib13445a0bd3029fb02b0b7a86e8e0b8278717b57
2012-02-23 19:13:38 -06:00
a3a496f9c2 Adds quantum service and endpoint to keystone if quantum is enabled.
Change-Id: I41eac84a48e8e716b77b7c874244c626b5df3006
2012-02-21 13:50:00 -08:00
d1f5243d91 Uses keystone client instead of keystone-manage
* Depends on https://review.openstack.org/#change,3948
 * Depends on https://review.openstack.org/#change,3945
 * Fixes bug 928558

Change-Id: I83c337e3b92a9ab0dac254afe83673185867b7b0
2012-02-09 03:50:57 +00:00
658ac7a4cc create and store secret and access keys 2012-02-06 22:56:37 +00:00
b0b6d315bd Changes to get devstack working again with ksl + trunk
Change-Id: I7261b2d88325d4f9cb3337478dbcbd04c25e52ed
2012-02-03 21:40:32 -08:00
8a41c9dad4 update to get keystone working 2012-02-02 17:31:19 -08:00