Align glance_puppet with cinder_puppet and upstream
Install glance base and API as the base class does nothing but glance packages install. Remove registry to be implemented as separate resource. Update parameters to match upstream ones. Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya
parent
47b52a27aa
commit
10afefd2e1
@ -353,41 +353,56 @@ def deploy():
|
||||
# signals.connect(keystone_puppet, nova_keystone_service_endpoint, {'ip': 'keystone_host', 'admin_port': 'keystone_port', 'admin_token': 'admin_token'})
|
||||
# signals.connect(rabbitmq_service1, nova_network_puppet, {'ip': 'rabbitmq_host', 'port': 'rabbitmq_port'})
|
||||
|
||||
# GLANCE (base and API)
|
||||
glance_api_puppet = vr.create('glance_api_puppet', 'resources/glance_puppet', {})[0]
|
||||
glance_db_user = vr.create('glance_db_user', 'resources/mariadb_user/', {
|
||||
'user_name': 'glance', 'user_password': 'glance', 'login_user': 'root'})[0]
|
||||
glance_db = vr.create('glance_db', 'resources/mariadb_db/', {
|
||||
'db_name': 'glance', 'login_user': 'root'})[0]
|
||||
glance_keystone_user = vr.create('glance_keystone_user', 'resources/keystone_user', {
|
||||
'user_name': 'glance', 'user_password': 'glance123'})[0]
|
||||
glance_keystone_role = vr.create('glance_keystone_role', 'resources/keystone_role', {
|
||||
'role_name': 'glance'})[0]
|
||||
glance_keystone_service_endpoint = vr.create(
|
||||
'glance_keystone_service_endpoint',
|
||||
'resources/keystone_service_endpoint', {
|
||||
'endpoint_name': 'glance',
|
||||
'adminurl': 'http://{{admin_ip}}:{{admin_port}}',
|
||||
'internalurl': 'http://{{internal_ip}}:{{internal_port}}',
|
||||
'publicurl': 'http://{{public_ip}}:{{public_port}}',
|
||||
'description': 'OpenStack Image Service', 'type': 'volume'})[0]
|
||||
|
||||
# GLANCE
|
||||
# glance = vr.create('glance', 'templates/glance.yml', {
|
||||
# 'idx': '1',
|
||||
# 'ip': 'node1::ip',
|
||||
# 'ssh_key': 'node1::ssh_key',
|
||||
# 'ssh_user': 'node1::ssh_user',
|
||||
# 'db_login_user': 'mariadb_service1::login_user',
|
||||
# 'db_login_password': 'mariadb_service1::root_password',
|
||||
# 'db_host': 'mariadb_service1::ip',
|
||||
# 'db_port': 'mariadb_service1::port',
|
||||
# 'db_name': 'glance',
|
||||
# 'db_user': 'glance',
|
||||
# 'db_password': 'glance123',
|
||||
# })[0]
|
||||
|
||||
glance_puppet = vr.create('glance_puppet', 'resources/glance_puppet', {})[0]
|
||||
glance_db_user = vr.create('glance_db_user', 'resources/mariadb_keystone_user/', {'new_user_name': 'glance', 'new_user_password': 'glance'})[0]
|
||||
glance_db = vr.create('glance_db', 'resources/mariadb_keystone_db/', {'db_name': 'glance', 'login_user': 'root'})[0]
|
||||
glance_keystone_user = vr.create('glance_keystone_user', 'resources/keystone_user', {'user_name': 'glance', 'user_password': 'glance123'})[0]
|
||||
glance_keystone_role = vr.create('glance_keystone_role', 'resources/keystone_role', {'role_name': 'glance'})[0]
|
||||
|
||||
signals.connect(node1, glance_puppet, {})
|
||||
signals.connect(mariadb_service1, glance_db)
|
||||
signals.connect(mariadb_service1, glance_db, {'port': 'login_port', 'root_password': 'login_password'})
|
||||
signals.connect(services_tenant, glance_keystone_user, {'tenant_name': 'tenant_name'})
|
||||
signals.connect(keystone_puppet, glance_keystone_user)
|
||||
signals.connect(keystone_puppet, glance_keystone_user, {'ip': 'keystone_host', 'port': 'keystone_port'})
|
||||
signals.connect(keystone_puppet, glance_puppet, {'ip': 'keystone_host', 'port': 'keystone_port'})
|
||||
signals.connect(node1, glance_api_puppet)
|
||||
signals.connect(node1, glance_db)
|
||||
signals.connect(node1, glance_db_user)
|
||||
signals.connect(admin_user, glance_api_puppet, {
|
||||
'user_name': 'keystone_user', 'user_password': 'keystone_password',
|
||||
'tenant_name': 'keystone_tenant'}) #?
|
||||
signals.connect(mariadb_service1, glance_db, {
|
||||
'port': 'login_port',
|
||||
'root_password': 'login_password',
|
||||
'root_user': 'login_user',
|
||||
'ip' : 'db_host'})
|
||||
signals.connect(mariadb_service1, glance_db_user, {'port': 'login_port', 'root_password': 'login_password'})
|
||||
signals.connect(glance_db, glance_db_user, {'db_name', 'db_host'})
|
||||
signals.connect(glance_db_user, glance_api_puppet, {
|
||||
'user_name':'db_user',
|
||||
'db_name':'db_name',
|
||||
'user_password':'db_password',
|
||||
'db_host' : 'db_host'})
|
||||
signals.connect(keystone_puppet, glance_api_puppet, {'ip': 'keystone_host', 'admin_port': 'keystone_port'}) #or non admin port?
|
||||
signals.connect(services_tenant, glance_keystone_user)
|
||||
signals.connect(glance_keystone_user, glance_keystone_role)
|
||||
signals.connect(mariadb_service1, glance_puppet, {'ip': 'db_host', 'port': 'db_port'})
|
||||
signals.connect(glance_db, glance_db_user)
|
||||
signals.connect(glance_db, glance_puppet, {'db_name': 'db_name'})
|
||||
signals.connect(glance_db_user, glance_puppet, {'new_user_name': 'db_user', 'new_user_password': 'db_password'})
|
||||
|
||||
signals.connect(glance_keystone_user, glance_api_puppet, {
|
||||
'user_name': 'keystone_user', 'tenant_name': 'keystone_tenant',
|
||||
'user_password': 'keystone_password'})
|
||||
signals.connect(mariadb_service1, glance_api_puppet, {'ip':'ip'})
|
||||
signals.connect(glance_api_puppet, glance_keystone_service_endpoint, {
|
||||
'ssh_key': 'ssh_key', 'ssh_user': 'ssh_user',
|
||||
'ip': ['ip', 'keystone_host', 'admin_ip', 'internal_ip', 'public_ip'],
|
||||
'port': ['admin_port', 'internal_port', 'public_port'],})
|
||||
signals.connect(keystone_puppet, glance_keystone_service_endpoint, {
|
||||
'admin_port': 'keystone_admin_port', 'admin_token': 'admin_token'})
|
||||
|
||||
has_errors = False
|
||||
for r in locals().values():
|
||||
@ -448,7 +463,7 @@ def deploy():
|
||||
actions.resource_action(glance_keystone_role, 'run')
|
||||
actions.resource_action(glance_db_user, 'run')
|
||||
actions.resource_action(glance_db, 'run')
|
||||
actions.resource_action(glance_puppet, 'run')
|
||||
actions.resource_action(glance_api_puppet, 'run')
|
||||
|
||||
#actions.resource_action(glance, 'run')
|
||||
|
||||
|
||||
@ -1,5 +1,194 @@
|
||||
# `glance_puppet` resource
|
||||
Glance (API) resource for puppet handler
|
||||
|
||||
Wraps OpenStack's `glance` Puppet resource from
|
||||
https://github.com/openstack/puppet-glance (`stable/juno` branch).
|
||||
Controlls a live cycle of the glance entities,
|
||||
like the main puppet class, auth, DB, AMQP, packages,
|
||||
keystone user, role and endpoint, API service. Also configures
|
||||
glance file backend.
|
||||
|
||||
Parameters
|
||||
|
||||
source https://github.com/openstack/puppet-glance/tree/5.1.0/manifests
|
||||
|
||||
``package_ensure``
|
||||
Ensure state for package.
|
||||
(Optional) Defaults to 'present'.
|
||||
|
||||
``filesystem_store_datadir``
|
||||
Location where dist images are stored.
|
||||
(Optional) Defaults to /var/lib/glance/images/.
|
||||
|
||||
source https://github.com/openstack/puppet-glance/blob/5.1.0/manifests/api.pp
|
||||
|
||||
``keystone_password``
|
||||
(required) Password used to authentication.
|
||||
|
||||
``verbose``
|
||||
(optional) Rather to log the glance api service at verbose level.
|
||||
Default: false
|
||||
|
||||
``debug``
|
||||
(optional) Rather to log the glance api service at debug level.
|
||||
Default: false
|
||||
|
||||
``bind_host``
|
||||
(optional) The address of the host to bind to.
|
||||
Default: 0.0.0.0
|
||||
|
||||
``bind_port``
|
||||
(optional) The port the server should bind to.
|
||||
Default: 9292
|
||||
|
||||
``backlog``
|
||||
(optional) Backlog requests when creating socket
|
||||
Default: 4096
|
||||
|
||||
``workers``
|
||||
(optional) Number of Glance API worker processes to start
|
||||
Default: $::processorcount
|
||||
|
||||
``log_file``
|
||||
(optional) The path of file used for logging
|
||||
If set to boolean false, it will not log to any file.
|
||||
Default: /var/log/glance/api.log
|
||||
|
||||
``log_dir``
|
||||
(optional) directory to which glance logs are sent.
|
||||
If set to boolean false, it will not log to any directory.
|
||||
Defaults to '/var/log/glance'
|
||||
|
||||
``registry_host``
|
||||
(optional) The address used to connect to the registry service.
|
||||
Default: 0.0.0.0
|
||||
|
||||
``registry_port``
|
||||
(optional) The port of the Glance registry service.
|
||||
Default: 9191
|
||||
|
||||
``registry_client_protocol``
|
||||
(optional) The protocol of the Glance registry service.
|
||||
Default: http
|
||||
|
||||
``auth_type``
|
||||
(optional) Type is authorization being used.
|
||||
Defaults to 'keystone'
|
||||
|
||||
`` auth_host``
|
||||
(optional) Host running auth service.
|
||||
Defaults to '127.0.0.1'.
|
||||
|
||||
``auth_url``
|
||||
(optional) Authentication URL.
|
||||
Defaults to 'http://localhost:5000/v2.0'.
|
||||
|
||||
`` auth_port``
|
||||
(optional) Port to use for auth service on auth_host.
|
||||
Defaults to '35357'.
|
||||
|
||||
`` auth_uri``
|
||||
(optional) Complete public Identity API endpoint.
|
||||
Defaults to false.
|
||||
|
||||
``auth_admin_prefix``
|
||||
(optional) Path part of the auth url.
|
||||
This allow admin auth URIs like http://auth_host:35357/keystone/admin.
|
||||
(where '/keystone/admin' is auth_admin_prefix)
|
||||
Defaults to false for empty. If defined, should be a string with a leading '/' and no trailing '/'.
|
||||
|
||||
`` auth_protocol``
|
||||
(optional) Protocol to use for auth.
|
||||
Defaults to 'http'.
|
||||
|
||||
``pipeline``
|
||||
(optional) Partial name of a pipeline in your paste configuration file with the
|
||||
service name removed.
|
||||
Defaults to 'keystone+cachemanagement'.
|
||||
|
||||
``keystone_tenant``
|
||||
(optional) Tenant to authenticate to.
|
||||
Defaults to services.
|
||||
|
||||
``keystone_user``
|
||||
(optional) User to authenticate as with keystone.
|
||||
Defaults to 'glance'.
|
||||
|
||||
``sql_idle_timeout``
|
||||
(optional) Deprecated. Use database_idle_timeout instead
|
||||
Defaults to false
|
||||
|
||||
``sql_connection``
|
||||
(optional) Deprecated. Use database_connection instead.
|
||||
Defaults to false
|
||||
|
||||
``database_connection``
|
||||
(optional) Connection url to connect to nova database.
|
||||
Defaults to 'sqlite:///var/lib/glance/glance.sqlite'
|
||||
|
||||
``database_idle_timeout``
|
||||
(optional) Timeout before idle db connections are reaped.
|
||||
Defaults to 3600
|
||||
|
||||
``use_syslog``
|
||||
(optional) Use syslog for logging.
|
||||
Defaults to false.
|
||||
|
||||
``log_facility``
|
||||
(optional) Syslog facility to receive log lines.
|
||||
Defaults to 'LOG_USER'.
|
||||
|
||||
``show_image_direct_url``
|
||||
(optional) Expose image location to trusted clients.
|
||||
Defaults to false.
|
||||
|
||||
``purge_config``
|
||||
(optional) Whether to set only the specified config options
|
||||
in the api config.
|
||||
Defaults to false.
|
||||
|
||||
``cert_file``
|
||||
(optinal) Certificate file to use when starting API server securely
|
||||
Defaults to false, not set
|
||||
|
||||
``key_file``
|
||||
(optional) Private key file to use when starting API server securely
|
||||
Defaults to false, not set
|
||||
|
||||
``ca_file``
|
||||
(optional) CA certificate file to use to verify connecting clients
|
||||
Defaults to false, not set
|
||||
|
||||
``mysql_module``
|
||||
(optional) Deprecated. Does nothing.
|
||||
|
||||
``known_stores``
|
||||
(optional)List of which store classes and store class locations are
|
||||
currently known to glance at startup.
|
||||
Defaults to false.
|
||||
Example: ['glance.store.filesystem.Store','glance.store.http.Store']
|
||||
|
||||
``image_cache_dir``
|
||||
(optional) Base directory that the Image Cache uses.
|
||||
Defaults to '/var/lib/glance/image-cache'.
|
||||
|
||||
``os_region_name``
|
||||
(optional) Sets the keystone region to use.
|
||||
Defaults to 'RegionOne'.
|
||||
|
||||
``validate``
|
||||
(optional) Whether to validate the service is working after any service refreshes
|
||||
Defaults to false
|
||||
|
||||
``validation_options``
|
||||
(optional) Service validation options
|
||||
Should be a hash of options defined in openstacklib::service_validation
|
||||
If empty, defaults values are taken from openstacklib function.
|
||||
Default command list images.
|
||||
Require validate set at True.
|
||||
Example:
|
||||
glance::api::validation_options:
|
||||
glance-api:
|
||||
command: check_glance-api.py
|
||||
path: /usr/bin:/bin:/usr/sbin:/sbin
|
||||
provider: shell
|
||||
tries: 5
|
||||
try_sleep: 10
|
||||
Defaults to {}
|
||||
@ -1,27 +1,9 @@
|
||||
$resource = hiera($::resource_name)
|
||||
|
||||
$ip = $resource['input']['ip']['value']
|
||||
|
||||
#class {'glance':
|
||||
# package_ensure => 'absent'
|
||||
#}
|
||||
#
|
||||
#user { 'glance':
|
||||
# name => 'glance',
|
||||
# ensure => 'absent',
|
||||
# home => '/home/glance',
|
||||
# system => true
|
||||
#}
|
||||
|
||||
|
||||
class { 'glance::api':
|
||||
#package_ensure => 'absent',
|
||||
verbose => true
|
||||
class {'glance::api':
|
||||
enabled => false,
|
||||
}
|
||||
|
||||
class { 'glance::registry':
|
||||
package_ensure => 'absent',
|
||||
verbose => true
|
||||
class {'glance':
|
||||
package_ensure => 'absent'
|
||||
}
|
||||
|
||||
class { 'glance::backend::file': }
|
||||
|
||||
@ -2,52 +2,100 @@ $resource = hiera($::resource_name)
|
||||
|
||||
$ip = $resource['input']['ip']['value']
|
||||
|
||||
$db_host = $resource['input']['db_host']['value']
|
||||
$db_port = $resource['input']['db_port']['value']
|
||||
$db_user = $resource['input']['db_user']['value']
|
||||
$db_password = $resource['input']['db_password']['value']
|
||||
$db_name = $resource['input']['db_name']['value']
|
||||
|
||||
$keystone_host = $resource['input']['keystone_host']['value']
|
||||
$keystone_port = $resource['input']['keystone_port']['value']
|
||||
$keystone_user = $resource['input']['keystone_user']['value']
|
||||
$keystone_password = $resource['input']['keystone_password']['value']
|
||||
$keystone_role = $resource['input']['keystone_role']['value']
|
||||
$keystone_tenant = $resource['input']['keystone_tenant']['value']
|
||||
$filesystem_store_datadir = $resource['input']['filesystem_store_datadir']['value']
|
||||
|
||||
#user { 'glance':
|
||||
# name => 'glance',
|
||||
# ensure => 'present',
|
||||
# home => '/home/glance',
|
||||
# system => true
|
||||
#}
|
||||
#
|
||||
#class {'glance':
|
||||
# package_ensure => 'present'
|
||||
#}
|
||||
$keystone_password = $resource['input']['keystone_password']['value']
|
||||
$verbose = $resource['input']['verbose']['value']
|
||||
$debug = $resource['input']['debug']['value']
|
||||
$bind_host = $resource['input']['bind_host']['value']
|
||||
$bind_port = $resource['input']['bind_port']['value']
|
||||
$backlog = $resource['input']['backlog']['value']
|
||||
$workers = $resource['input']['workers']['value']
|
||||
$log_file = $resource['input']['log_file']['value']
|
||||
$log_dir = $resource['input']['log_dir']['value']
|
||||
$registry_host = $resource['input']['registry_host']['value']
|
||||
$registry_port = $resource['input']['registry_port']['value']
|
||||
$registry_client_protocol = $resource['input']['registry_client_protocol']['value']
|
||||
$auth_type = $resource['input']['auth_type']['value']
|
||||
$auth_host = $resource['input']['auth_host']['value']
|
||||
$auth_url = $resource['input']['auth_url']['value']
|
||||
$auth_port = $resource['input']['auth_port']['value']
|
||||
$auth_uri = $resource['input']['auth_uri']['value']
|
||||
$auth_admin_prefix = $resource['input']['auth_admin_prefix']['value']
|
||||
$auth_protocol = $resource['input']['auth_protocol']['value']
|
||||
$pipeline = $resource['input']['pipeline']['value']
|
||||
$keystone_tenant = $resource['input']['keystone_tenant']['value']
|
||||
$keystone_user = $resource['input']['keystone_user']['value']
|
||||
$use_syslog = $resource['input']['use_syslog']['value']
|
||||
$log_facility = $resource['input']['log_facility']['value']
|
||||
$show_image_direct_url = $resource['input']['show_image_direct_url']['value']
|
||||
$purge_config = $resource['input']['purge_config']['value']
|
||||
$cert_file = $resource['input']['cert_file']['value']
|
||||
$key_file = $resource['input']['key_file']['value']
|
||||
$ca_file = $resource['input']['ca_file']['value']
|
||||
$known_stores = $resource['input']['known_stores']['value']
|
||||
$database_connection = $resource['input']['database_connection']['value']
|
||||
$database_idle_timeout = $resource['input']['database_idle_timeout']['value']
|
||||
$image_cache_dir = $resource['input']['image_cache_dir']['value']
|
||||
$os_region_name = $resource['input']['os_region_name']['value']
|
||||
$validate = $resource['input']['validate']['value']
|
||||
$validation_options = $resource['input']['validation_options']['value']
|
||||
$mysql_module = $resource['input']['mysql_module']['value']
|
||||
$sql_idle_timeout = $resource['input']['sql_idle_timeout']['value']
|
||||
|
||||
class { 'glance::api':
|
||||
#package_ensure => 'present',
|
||||
verbose => true,
|
||||
keystone_tenant => $keystone_tenant,
|
||||
keystone_user => $keystone_user,
|
||||
keystone_password => $keystone_password,
|
||||
database_connection => "mysql://$db_user:$db_password@$db_host/$db_name",
|
||||
class {'glance':
|
||||
package_ensure => 'present',
|
||||
}
|
||||
|
||||
class { 'glance::registry':
|
||||
package_ensure => 'present',
|
||||
verbose => true,
|
||||
keystone_tenant => $keystone_tenant,
|
||||
keystone_user => $keystone_user,
|
||||
keystone_password => $keystone_password,
|
||||
database_connection => "mysql://$db_user:$db_password@$db_host/$db_name",
|
||||
class {'glance::api':
|
||||
keystone_password => $keystone_password,
|
||||
enabled => true,
|
||||
manage_service => true,
|
||||
verbose => $verbose,
|
||||
debug => $debug,
|
||||
bind_host => $bind_host,
|
||||
bind_port => $bind_port,
|
||||
backlog => $backlog,
|
||||
workers => $workers,
|
||||
log_file => $log_file,
|
||||
log_dir => $log_dir,
|
||||
registry_host => $registry_host,
|
||||
registry_port => $registry_port,
|
||||
registry_client_protocol => $registry_client_protocol,
|
||||
auth_type => $auth_type,
|
||||
auth_host => $auth_host,
|
||||
auth_url => $auth_url,
|
||||
auth_port => $auth_port,
|
||||
auth_uri => $auth_uri,
|
||||
auth_admin_prefix => $auth_admin_prefix,
|
||||
auth_protocol => $auth_protocol,
|
||||
pipeline => $pipeline,
|
||||
keystone_tenant => $keystone_tenant,
|
||||
keystone_user => $keystone_user,
|
||||
use_syslog => $use_syslog,
|
||||
log_facility => $log_facility,
|
||||
show_image_direct_url => $show_image_direct_url,
|
||||
purge_config => $purge_config,
|
||||
cert_file => $cert_file,
|
||||
key_file => $key_file,
|
||||
ca_file => $ca_file,
|
||||
known_stores => $known_stores,
|
||||
database_connection => "mysql://${db_user}:${db_password}@${ip}/${db_name}",
|
||||
database_idle_timeout => $database_idle_timeout,
|
||||
image_cache_dir => $image_cache_dir,
|
||||
os_region_name => $os_region_name,
|
||||
validate => $validate,
|
||||
validation_options => $validation_options,
|
||||
mysql_module => $mysql_module,
|
||||
sql_idle_timeout => $sql_idle_timeout,
|
||||
}->
|
||||
|
||||
class { 'glance::backend::file':
|
||||
filesystem_store_datadir => $filesystem_store_datadir,
|
||||
}
|
||||
|
||||
class { 'glance::backend::file': }
|
||||
|
||||
#file { '/etc/keystone/keystone-exports':
|
||||
# owner => 'root',
|
||||
# group => 'root',
|
||||
# content => template('keystone/exports.erb')
|
||||
#}
|
||||
|
||||
@ -1,7 +1 @@
|
||||
class {'keystone':
|
||||
verbose => True,
|
||||
catalog_type => 'sql',
|
||||
admin_token => '{{ admin_token }}',
|
||||
sql_connection => 'mysql://{{ db_user }}:{{ db_password }}@{{ ip }}/{{ db_name }}',
|
||||
public_port => '{{ port }}'
|
||||
}
|
||||
notify { "noop update": }
|
||||
|
||||
@ -3,44 +3,134 @@ handler: puppet
|
||||
puppet_module: glance
|
||||
version: 1.0.0
|
||||
input:
|
||||
db_host:
|
||||
schema: str!
|
||||
value:
|
||||
db_port:
|
||||
schema: int!
|
||||
value:
|
||||
db_user:
|
||||
schema: str!
|
||||
value: keystone
|
||||
db_password:
|
||||
schema: str!
|
||||
value: keystone
|
||||
db_name:
|
||||
schema: str!
|
||||
value: keystone
|
||||
|
||||
keystone_host:
|
||||
schema: str!
|
||||
value:
|
||||
keystone_port:
|
||||
schema: int!
|
||||
value: 5000
|
||||
keystone_user:
|
||||
schema: str!
|
||||
value: glance
|
||||
keystone_role:
|
||||
schema: str!
|
||||
value: glance
|
||||
keystone_password:
|
||||
schema: str!
|
||||
value: glance123
|
||||
package_ensure:
|
||||
schema: str
|
||||
value: 'present'
|
||||
filesystem_store_datadir:
|
||||
schema: str
|
||||
value: '/var/lib/glance/images/'
|
||||
verbose:
|
||||
schema: bool
|
||||
value: false
|
||||
debug:
|
||||
schema: bool
|
||||
value: false
|
||||
bind_host:
|
||||
schema: str
|
||||
value: '0.0.0.0'
|
||||
bind_port:
|
||||
schema: int
|
||||
value: 9292
|
||||
backlog:
|
||||
schema: int
|
||||
value: 4096
|
||||
workers:
|
||||
schema: int
|
||||
value: 1
|
||||
log_file:
|
||||
schema: str
|
||||
value: '/var/log/glance/api.log'
|
||||
log_dir:
|
||||
schema: str
|
||||
value: '/var/log/glance'
|
||||
registry_host:
|
||||
schema: str
|
||||
value: '0.0.0.0'
|
||||
registry_port:
|
||||
schema: int
|
||||
value: 9191
|
||||
registry_client_protocol:
|
||||
schema: str
|
||||
value: 'http'
|
||||
auth_type:
|
||||
schema: str
|
||||
value: 'keystone'
|
||||
auth_host:
|
||||
schema: str
|
||||
value: '127.0.0.1'
|
||||
auth_url:
|
||||
schema: str
|
||||
value: 'http://localhost:5000/v2.0'
|
||||
auth_port:
|
||||
schema: int
|
||||
value: 35357
|
||||
auth_uri:
|
||||
schema: str
|
||||
value: ''
|
||||
auth_admin_prefix:
|
||||
schema: str
|
||||
value: ''
|
||||
auth_protocol:
|
||||
schema: str
|
||||
value: 'http'
|
||||
pipeline:
|
||||
schema: str
|
||||
value: 'keystone+cachemanagement'
|
||||
keystone_tenant:
|
||||
schema: str!
|
||||
value: services
|
||||
schema: str
|
||||
value: 'services'
|
||||
keystone_user:
|
||||
schema: str
|
||||
value: 'glance'
|
||||
use_syslog:
|
||||
schema: bool
|
||||
value: false
|
||||
log_facility:
|
||||
schema: str
|
||||
value: 'LOG_USER'
|
||||
show_image_direct_url:
|
||||
schema: bool
|
||||
value: false
|
||||
purge_config:
|
||||
schema: bool
|
||||
value: false
|
||||
cert_file:
|
||||
schema: str
|
||||
value: ''
|
||||
key_file:
|
||||
schema: str
|
||||
value: ''
|
||||
ca_file:
|
||||
schema: str
|
||||
value: ''
|
||||
known_stores:
|
||||
schema: str
|
||||
value: ''
|
||||
database_connection:
|
||||
schema: str
|
||||
value: 'sqlite:///var/lib/glance/glance.sqlite'
|
||||
database_idle_timeout:
|
||||
schema: int
|
||||
value: 3600
|
||||
image_cache_dir:
|
||||
schema: str
|
||||
value: '/var/lib/glance/image-cache'
|
||||
os_region_name:
|
||||
schema: str
|
||||
value: 'RegionOne'
|
||||
validate:
|
||||
schema: bool
|
||||
value: false
|
||||
validation_options:
|
||||
schema: {}
|
||||
value: {}
|
||||
mysql_module:
|
||||
schema: str
|
||||
value: ''
|
||||
sql_idle_timeout:
|
||||
schema: str
|
||||
value: ''
|
||||
sql_connection:
|
||||
schema: str
|
||||
value: ''
|
||||
|
||||
port:
|
||||
schema: int!
|
||||
value: 9292
|
||||
|
||||
git:
|
||||
schema: {repository: str!, branch: str!}
|
||||
value: {repository: 'https://github.com/openstack/puppet-glance', branch: 'stable/juno'}
|
||||
value: {repository: 'https://github.com/openstack/puppet-glance', branch: '5.1.0'}
|
||||
|
||||
ip:
|
||||
schema: str!
|
||||
@ -52,4 +142,33 @@ input:
|
||||
schema: str!
|
||||
value:
|
||||
|
||||
tags: [resource/glance_service, resources/glance]
|
||||
db_user:
|
||||
schema: str!
|
||||
value: cinder
|
||||
db_password:
|
||||
schema: str!
|
||||
value: cinder
|
||||
db_name:
|
||||
schema: str!
|
||||
value: cinder
|
||||
db_host:
|
||||
schema: str!
|
||||
value:
|
||||
|
||||
keystone_host:
|
||||
schema: str!
|
||||
value: ''
|
||||
keystone_port:
|
||||
schema: int!
|
||||
value: ''
|
||||
keystone_user:
|
||||
schema: str!
|
||||
value: ''
|
||||
keystone_password:
|
||||
schema: str!
|
||||
value: ''
|
||||
keystone_tenant:
|
||||
schema: str!
|
||||
value: ''
|
||||
|
||||
tags: [resource/glance_service, resources/glance, resource/glance_api_service]
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
import json
|
||||
import requests
|
||||
|
||||
from solar.core.log import log
|
||||
@ -6,25 +5,7 @@ from solar.core.log import log
|
||||
|
||||
def test(resource):
|
||||
log.debug('Testing glance_puppet')
|
||||
res = requests.get(
|
||||
'http://%s:9292' % resource.args['ip'].value
|
||||
requests.get(
|
||||
'http://%s:%s' % (resource.args['ip'].value, resource.args['port'].value)
|
||||
)
|
||||
|
||||
token_data = requests.post(
|
||||
'http://%s:%s/v2.0/tokens' % (resource.args['keystone_host'].value,
|
||||
resource.args['keystone_port'].value),
|
||||
json.dumps({
|
||||
'auth': {
|
||||
'tenantName': resource.args['tenant_name'].value,
|
||||
'passwordCredentials': {
|
||||
'username': resource.args['user_name'].value,
|
||||
'password': resource.args['user_password'].value,
|
||||
},
|
||||
},
|
||||
}),
|
||||
headers={'Content-Type': 'application/json'}
|
||||
)
|
||||
|
||||
token = token_data.json()['access']['token']['id']
|
||||
|
||||
print res.json()
|
||||
#TODO(bogdando) test packages installed and filesystem store datadir created
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user