stackforge-attic/murano-repository
Code Issues Proposed changes

Update ui forms, setup.py and confing file

Browse Source 
Change-Id: I2fe17a7dcb58248ff1fb1d6a85c61b26e7394e76
This commit is contained in:
Ekaterina Fedorova
2013-10-24 16:28:49 +04:00
parent 2d01ea5d50
commit d7405d80cb
13 changed files with 70 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Services/ui_forms/ActiveDirectory.yaml
View File

@@ -115,6 +115,7 @@ forms:
required: false
- name: osImage
type: image
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and

1
Services/ui_forms/AspNetApp.yaml
View File

@@ -93,6 +93,7 @@ forms:
required: false
- name: osImage
type: image
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and

1
Services/ui_forms/AspNetAppFarm.yaml
View File

@@ -118,6 +118,7 @@ forms:
required: false
- name: osImage
type: image
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and

1
Services/ui_forms/Demo.yaml
View File

@@ -68,6 +68,7 @@ forms:
required: false
- name: osImage
type: image
imageType: cirros.demo
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and

14
Services/ui_forms/MsSqlClusterServer.yaml
View File

@@ -25,9 +25,6 @@ forms:
hidden: true
attributeNames: false
description: MS SQL Failover Cluster
# temporaryHack
widgetMedia:
js: [muranodashboard/js/mixed-mode.js, muranodashboard/js/external-ad.js]
- name: name
type: string
label: Service Name
@@ -54,6 +51,10 @@ forms:
label: Active Directory is configured by the System Administrator
widgetAttrs: # temporary hack
class: external-ad
# temporaryHack
widgetMedia:
js: [muranodashboard/js/external-ad.js]
css: {all: [muranodashboard/css/checkbox.css]}
required: false
- name: domainAdminUserName
type: string
@@ -84,6 +85,10 @@ forms:
credentials but supplements them with local SQL Server user
accounts that the administrator may create and maintain within
SQL Server. If this mode is on SA password is required
# temporaryHack
widgetMedia:
js: [muranodashboard/js/mixed-mode.js]
css: {all: [muranodashboard/css/checkbox.css]}
- name: saPassword
type: password
label: SA Password
@@ -92,7 +97,7 @@ forms:
enabled: {YAQL: $.serviceConfiguration.mixedModeAuth}
- clusterConfiguration:
fields:
- name: clusterIP
- name: clusterIp
type: clusterip
label: Cluster Static IP
description: Specify a valid IPv4 fixed IP.
@@ -219,6 +224,7 @@ forms:
required: false
- name: osImage
type: image
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and

8
Services/ui_forms/MsSqlServer.yaml
View File

@@ -17,9 +17,6 @@ forms:
hidden: true
attributeNames: false
description: MS SQL Server
# temporaryHack
widgetMedia:
js: [muranodashboard/js/mixed-mode.js]
- name: name
type: string
label: Service Name
@@ -64,6 +61,10 @@ forms:
credentials but supplements them with local SQL Server user
accounts that the administrator may create and maintain within
SQL Server. If this mode is on SA password is required
# temporaryHack
widgetMedia:
js: [muranodashboard/js/mixed-mode.js]
css: {all: [muranodashboard/css/checkbox.css]}
- name: saPassword
type: password
label: SA Password
@@ -103,6 +104,7 @@ forms:
required: false
- name: osImage
type: image
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and

1
Services/ui_forms/WebServer.yaml
View File

@@ -84,6 +84,7 @@ forms:
required: false
- name: osImage
type: image
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and

1
Services/ui_forms/WebServerFarm.yaml
View File

@@ -105,6 +105,7 @@ forms:
required: false
- name: osImage
type: image
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and

26
etc/murano-repository.conf
View File

@@ -1,19 +1,12 @@
[DEFAULT]
# Address to bind the server to
host = localhost
host = 0.0.0.0
# Port the bind the server to
port = 5000
# Keystone related stuff
auth_host = 172.18.124.202
auth_port = 5000
auth_protocol = http
admin_user = admin
admin_password = swordfish
admin_tenant_name = admin
port = 8084
# Provide information about data types
# absolute or relative path to manifest location(root directory)
# where absolute path starts with '/',
# where absolute path starts with / and relative to the repository folder
# while relative hasn't leading '/' and is prepended to the repository folder
manifests = Services
@@ -32,4 +25,15 @@ ui = service_forms
workflows = workflows
heat = templates/cf
agent = templates/agent
scripts = templates/agent/script
scripts = templates/agent/scripts
#Configure keystone location.
#For more information see Auth-Token Middleware with Username and Password
#http://docs.openstack.org/developer/keystone/configuringservices.html
[keystone]
auth_host = 127.0.0.1
auth_port = 5000
auth_protocol = http
admin_user = admin
admin_password = swordfish
admin_tenant_name = admin

12
muranorepository/cmd/run.py
View File

@@ -52,12 +52,12 @@ def main():
log.setup('muranorepository')
app = server.make_app({
'auth_host': cfg.CONF.auth_host,
'auth_port': cfg.CONF.auth_port,
'auth_protocol': cfg.CONF.auth_protocol,
'admin_user': cfg.CONF.admin_user,
'admin_password': cfg.CONF.admin_password,
'admin_tenant_name': cfg.CONF.admin_tenant_name
'auth_host': cfg.CONF.keystone.auth_host,
'auth_port': cfg.CONF.keystone.auth_port,
'auth_protocol': cfg.CONF.keystone.auth_protocol,
'admin_user': cfg.CONF.keystone.admin_user,
'admin_password': cfg.CONF.keystone.admin_password,
'admin_tenant_name': cfg.CONF.keystone.admin_tenant_name
})
if not os.path.isabs(config.CONF.manifests):
config.CONF.manifests = os.path.join(possible_topdir,

12
muranorepository/config.py
View File

@@ -18,17 +18,19 @@ from muranorepository.consts import *
server_opts = [
cfg.StrOpt('host', default='127.0.0.1'),
cfg.IntOpt('port', default=5000),
cfg.StrOpt('auth_host', default=None),
cfg.IntOpt('port', default=5000)]
keystone_opts = [
cfg.StrOpt('auth_host', default='localhost'),
cfg.IntOpt('auth_port', default=5000),
cfg.StrOpt('auth_protocol', default='http'),
cfg.StrOpt('admin_user', default='admin'),
cfg.StrOpt('admin_password', default=None),
cfg.StrOpt('admin_tenant_name', default='admin')
]
cfg.StrOpt('admin_tenant_name', default='admin')]
type_dirs_opts = [cfg.StrOpt(x) for x in DATA_TYPES]
cfg.set_defaults(log.log_opts,
default_log_levels=['qpid.messaging=INFO',
'keystoneclient=INFO',
@@ -37,6 +39,8 @@ CONF = cfg.CONF
CONF.register_cli_opts(server_opts)
CONF.register_opts(type_dirs_opts)
CONF.register_opts(type_dirs_opts, group='output')
CONF.register_opts(keystone_opts, group='keystone')
ARGV = []

1
requirements.txt
View File

@@ -1,4 +1,3 @@
d2to1>=0.2.10,<0.3
pbr>=0.5.21,<1.0
eventlet>=0.13.0
Flask>=0.10,<1.0

8
setup.py
View File

@@ -17,9 +17,5 @@
import setuptools
setuptools.setup(
setup_requires=[
'd2to1>=0.2.10,<0.3',
'pbr>=0.5,<0.6'
],
d2to1=True,
)
setup_requires=['pbr'],
pbr=True)