From 9d443dd14f8065566e1e6e229dc50a490e6b81e2 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Wed, 28 Nov 2012 16:03:42 -0800 Subject: [PATCH] Add README, copyright. Drop example and deployer logs. --- README | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++ README.ex | 41 ------------------ config.yaml | 8 +--- copyright | 17 ++++++++ debug.log | 17 -------- juju.log | 80 ---------------------------------- 6 files changed, 142 insertions(+), 144 deletions(-) create mode 100644 README delete mode 100644 README.ex create mode 100644 copyright delete mode 100644 debug.log delete mode 100644 juju.log diff --git a/README b/README new file mode 100644 index 00000000..4b579555 --- /dev/null +++ b/README @@ -0,0 +1,123 @@ +Overview +-------- + +This charm provides the Cinder volume service for OpenStack. It is intended to +be used alongside the other OpenStack components, starting with the Folsom +release. + +Cinder is made up of 3 separate services: an API service, a scheduler and a +volume service. This charm allows them to be deployed in different +combination, depending on user preference and requirements. + +This charm was developed to support deploying Folsom on both +Ubuntu Quantal and Ubuntu Precise. Since Cinder is only available for +Ubuntu 12.04 via the Ubuntu Cloud Archive, deploying this charm to a +Precise machine will by default install Cinder and its dependencies from +the Cloud Archive. + +Usage +----- + +Cinder may be deployed in a number of ways. This charm focuses on 3 main +configurations. All require the existence of the other core OpenStack +services deployed via Juju charms, specifically: mysql, rabbitmq-server, +keystone and nova-cloud-controller. The following assumes these services +have already been deployed. + +a. Basic, all-in-one using local storage and iSCSI. + +The api server, scheduler and volume service are all deployed into the same +unit. Local storage will be initialized as a LVM phsyical device, and a volume +group initialized. Instance volumes will be created locally as logical volumes +and exported to instances via iSCSI. This is ideal for small-scale deployments +or testing: + + $ cat >cinder.cfg <cinder.cfg <cinder.cfg < +Report bugs at: http://bugs.launchpad.net/charms +Location: http://jujucharms.com diff --git a/README.ex b/README.ex deleted file mode 100644 index febcc08b..00000000 --- a/README.ex +++ /dev/null @@ -1,41 +0,0 @@ -Describe the intended usage of this charm and anything unique about how -this charm relates to others here. - -This README will be displayed in the Charm Store, it should be either Markdown or RST. Ideal READMEs include instructions on how to use the charm, expected usage, and charm features that your audience might be interested in. For an example of a well written README check out Hadoop: http://jujucharms.com/charms/precise/hadoop - -Here's an example you might wish to template off of: - -Overview --------- - -This charm provides (service) from (service homepage). Add a description here of what the service itself actually does. - - -Usage ------ - -Step by step instructions on using the charm: - - juju deploy servicename - -and so on. If you're providing a web service or something that the end user needs to go to, tell them here, especially if you're deploying a service that might listen to a non-default port. - -You can then browse to http://ip-address to configure the service. - -Configuration -------------- - -The configuration options will be listed on the charm store, however If you're making assumptions or opinionated decisions in the charm (like setting a default administrator password), you should detail that here so the user knows how to change it immediately, etc. - - -Contact Information -------------------- - -Though this will be listed in the charm store itself don't assume a user will know that, so include that information here: - -Author: -Report bugs at: http://bugs.launchpad.net/charms -Location: http://jujucharms.com - -* Be sure to remove the templated parts before submitting to https://launchpad.net/charms for inclusion in the charm store. - diff --git a/config.yaml b/config.yaml index 24a060f6..794a4992 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ options: - cinder-release: + openstack-origin: default: distro type: string description: | @@ -11,7 +11,7 @@ options: cloud:precise-folsom/updates, cloud:precise-folsom/staging, cloud:precise-folsom/proposed. - When deploying to Precise, the default distro option will use + When deploying to Precise, the default distro option will use the cloud:precise-folsom/updates repository instead, since Cinder was not available in the Ubuntu archive for Precise and is only available via the Ubuntu Cloud Archive. @@ -58,7 +58,3 @@ options: default: 8776 type: int description: OpenStack Volume API listening port. - config-flags: - default: None - type: string - description: Comma separated list of key=value config flags to be set in cinder.conf diff --git a/copyright b/copyright new file mode 100644 index 00000000..a6ddcf83 --- /dev/null +++ b/copyright @@ -0,0 +1,17 @@ +Format: http://dep.debian.net/deps/dep5/ + +Files: * +Copyright: Copyright 2012, Canonical Ltd., All Rights Reserved. +License: GPL-3 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . diff --git a/debug.log b/debug.log deleted file mode 100644 index 4e5c2822..00000000 --- a/debug.log +++ /dev/null @@ -1,17 +0,0 @@ -[DEBUG] Calling 'juju status'... -[DEBUG] Destroying service: nova-volume -[DEBUG] Calling juju, attempt 1: juju destroy-service nova-volume -[DEBUG] Destroying service: keystone -[DEBUG] Calling juju, attempt 1: juju destroy-service keystone -[DEBUG] Destroying service: nova-cloud-controller -[DEBUG] Calling juju, attempt 1: juju destroy-service nova-cloud-controller -[DEBUG] Destroying service: mysql -[DEBUG] Calling juju, attempt 1: juju destroy-service mysql -[DEBUG] Terminating machine: 16 -[DEBUG] Calling juju, attempt 1: juju terminate-machine 16 -[DEBUG] Terminating machine: 13 -[DEBUG] Calling juju, attempt 1: juju terminate-machine 13 -[DEBUG] Terminating machine: 14 -[DEBUG] Calling juju, attempt 1: juju terminate-machine 14 -[DEBUG] Terminating machine: 15 -[DEBUG] Calling juju, attempt 1: juju terminate-machine 15 diff --git a/juju.log b/juju.log deleted file mode 100644 index 96ba805c..00000000 --- a/juju.log +++ /dev/null @@ -1,80 +0,0 @@ -2012-09-21 17:52:34,141 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:34,141 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:34,141 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:34,141 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:34,143 INFO Connecting to environment... -2012-09-21 17:52:36,151 INFO Connected to environment. -2012-09-21 17:52:37,124 INFO Service 'nova-volume' destroyed. -2012-09-21 17:52:37,124 INFO 'destroy_service' command finished successfully -2012-09-21 17:52:37,572 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:37,572 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:37,572 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:37,572 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:37,573 INFO Connecting to environment... -2012-09-21 17:52:39,589 INFO Connected to environment. -2012-09-21 17:52:40,608 INFO Service 'keystone' destroyed. -2012-09-21 17:52:40,609 INFO 'destroy_service' command finished successfully -2012-09-21 17:52:41,047 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:41,047 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:41,047 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:41,047 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:41,048 INFO Connecting to environment... -2012-09-21 17:52:43,035 INFO Connected to environment. -2012-09-21 17:52:43,990 INFO Service 'nova-cloud-controller' destroyed. -2012-09-21 17:52:43,990 INFO 'destroy_service' command finished successfully -2012-09-21 17:52:44,427 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:44,428 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:44,428 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:44,428 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:44,429 INFO Connecting to environment... -2012-09-21 17:52:46,524 INFO Connected to environment. -2012-09-21 17:52:47,378 INFO Service 'mysql' destroyed. -2012-09-21 17:52:47,379 INFO 'destroy_service' command finished successfully -2012-09-21 17:52:47,822 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:47,822 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:47,822 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:47,822 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:47,823 INFO Connecting to environment... -2012-09-21 17:52:49,836 INFO Connected to environment. -2012-09-21 17:52:49,837 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:49,837 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:49,838 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:49,838 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:50,158 INFO Machines terminated: 16 -2012-09-21 17:52:50,158 INFO 'terminate_machine' command finished successfully -2012-09-21 17:52:50,604 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:50,605 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:50,605 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:50,605 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:50,606 INFO Connecting to environment... -2012-09-21 17:52:52,668 INFO Connected to environment. -2012-09-21 17:52:52,669 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:52,669 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:52,669 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:52,669 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:52,988 INFO Machines terminated: 13 -2012-09-21 17:52:52,989 INFO 'terminate_machine' command finished successfully -2012-09-21 17:52:53,427 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:53,427 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:53,427 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:53,427 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:53,428 INFO Connecting to environment... -2012-09-21 17:52:55,482 INFO Connected to environment. -2012-09-21 17:52:55,483 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:55,483 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:55,483 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:55,484 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:55,801 INFO Machines terminated: 14 -2012-09-21 17:52:55,802 INFO 'terminate_machine' command finished successfully -2012-09-21 17:52:56,243 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:56,243 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:56,243 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:56,243 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:56,244 INFO Connecting to environment... -2012-09-21 17:52:58,284 INFO Connected to environment. -2012-09-21 17:52:58,285 WARNING ssl-hostname-verification is disabled for this environment -2012-09-21 17:52:58,285 WARNING EC2 API calls encrypted but not authenticated -2012-09-21 17:52:58,286 WARNING S3 API calls encrypted but not authenticated -2012-09-21 17:52:58,286 WARNING Ubuntu Cloud Image lookups encrypted but not authenticated -2012-09-21 17:52:58,605 INFO Machines terminated: 15 -2012-09-21 17:52:58,606 INFO 'terminate_machine' command finished successfully