summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorin Hochstein <lorin@nimbisservices.com>2013-06-08 20:22:35 -0400
committerLorin Hochstein <lorin@nimbisservices.com>2013-06-08 20:22:35 -0400
commit2084763c4dab67059719f4dc082789d53ade7c6a (patch)
tree5209ff87339b80f089865477443d8750485dd003
parent31b17ee71f16320b45f8587e358a2513f54aa345 (diff)
downloadopenstack-ansible-modules-2084763c4dab67059719f4dc082789d53ade7c6a.tar.gz
Metadata updates
-rw-r--r--cinder_manage8
-rw-r--r--glance_manage6
-rw-r--r--keystone_manage8
-rw-r--r--keystone_service66
4 files changed, 76 insertions, 12 deletions
diff --git a/cinder_manage b/cinder_manage
index e64380d..17c42b5 100644
--- a/cinder_manage
+++ b/cinder_manage
@@ -17,11 +17,13 @@ options:
required: false
default: /etc/cinder/cinder.conf
requirements: [ cinder ]
-examples:
- - code: 'cinder_manage action=dbsync'
-
author: Lorin Hochstein
'''
+
+EXAMPLES = '''
+cinder_manage: action=dbsync
+'''
+
import subprocess
try:
diff --git a/glance_manage b/glance_manage
index df1b111..96a6322 100644
--- a/glance_manage
+++ b/glance_manage
@@ -17,11 +17,13 @@ options:
required: false
default: /etc/glance/glance-registry.conf
requirements: [ glance ]
-examples:
- - code: 'glance_manage action=dbsync'
author: Lorin Hochstein
'''
+EXAMPLES = '''
+glance_manage: action=dbsync
+'''
+
try:
from glance.db.sqlalchemy import migration
from glance.common.exception import DatabaseMigrationError
diff --git a/keystone_manage b/keystone_manage
index 75f8cb5..cfba55b 100644
--- a/keystone_manage
+++ b/keystone_manage
@@ -17,11 +17,13 @@ options:
required: false
default: /etc/keystone/keystone.conf
requirements: [ keystone ]
-examples:
- - code: 'keystone_manage action=dbsync'
-
author: Lorin Hochstein
'''
+
+EXAMPLES = '''
+keystone_manage: action=dbsync
+'''
+
import subprocess
try:
diff --git a/keystone_service b/keystone_service
index ca709ef..a2be336 100644
--- a/keystone_service
+++ b/keystone_service
@@ -5,13 +5,71 @@ DOCUMENTATION = '''
---
module: keystone_service
short_description: Manage OpenStack Identity (keystone) service endpoints
-requirements: [ python-keystoneclinet ]
-examples:
- - code: 'keystone_service: name=keystone type=identity description="Keystone Identity Service" publicurl=http://192.168.206.130:5000/v2.0 internalurl=http://192.168.206.130:5000/v2.0 adminurl=http://192.168.206.130:35357/v2.0'
- - code: 'keystone_service: name=glance type=image description="Glance Identity Service" url=http://192.168.206.130:9292'
+options:
+ name:
+ description:
+ - name of service (e.g., keystone)
+ required: yes
+ type:
+ description:
+ - type of service (e.g., identity)
+ required: yes
+ description:
+ description:
+ - description of service (e.g., Identity Service)
+ required: yes
+ public_url:
+ description:
+ - public url of service.
+ - 'Alias: I(url)'
+ - 'Alias: I(publicurl)'
+ required: yes
+ internal_url:
+ description:
+ - internal url of service.
+ - 'Alias: I(internalurl)'
+ required: no
+ default: value of public_url
+ admin_url:
+ description:
+ - admin url of service.
+ - 'Alias: I(adminurl)'
+ required: no
+ default: value of public_url
+ region:
+ description:
+ - region of service
+ required: yes
+ state:
+ description:
+ - Indicate desired state of the resource
+ choices: ['present', 'absent']
+ default: present
+
+
+
+requirements: [ python-keystoneclient ]
author: Lorin Hochstein
'''
+EXAMPLES = '''
+examples:
+keystone_service: >
+ name=keystone
+ type=identity
+ description="Keystone Identity Service"
+ publicurl=http://192.168.206.130:5000/v2.0
+ internalurl=http://192.168.206.130:5000/v2.0
+ adminurl=http://192.168.206.130:35357/v2.0
+
+keystone_service: >
+ name=glance
+ type=image
+ description="Glance Identity Service"
+ url=http://192.168.206.130:9292
+
+'''
+
try:
from keystoneclient.v2_0 import client
except ImportError: