diff --git a/Services/ui_forms/ActiveDirectory.yaml b/Services/ui_forms/ActiveDirectory.yaml
index b1fbe14..4c0d148 100644
--- a/Services/ui_forms/ActiveDirectory.yaml
+++ b/Services/ui_forms/ActiveDirectory.yaml
@@ -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
diff --git a/Services/ui_forms/AspNetApp.yaml b/Services/ui_forms/AspNetApp.yaml
index 0aad239..5e72f70 100644
--- a/Services/ui_forms/AspNetApp.yaml
+++ b/Services/ui_forms/AspNetApp.yaml
@@ -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
diff --git a/Services/ui_forms/AspNetAppFarm.yaml b/Services/ui_forms/AspNetAppFarm.yaml
index 21fd001..b42972e 100644
--- a/Services/ui_forms/AspNetAppFarm.yaml
+++ b/Services/ui_forms/AspNetAppFarm.yaml
@@ -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
diff --git a/Services/ui_forms/Demo.yaml b/Services/ui_forms/Demo.yaml
index 12c3064..ca9905c 100644
--- a/Services/ui_forms/Demo.yaml
+++ b/Services/ui_forms/Demo.yaml
@@ -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
diff --git a/Services/ui_forms/MsSqlClusterServer.yaml b/Services/ui_forms/MsSqlClusterServer.yaml
index a023207..d8ef850 100644
--- a/Services/ui_forms/MsSqlClusterServer.yaml
+++ b/Services/ui_forms/MsSqlClusterServer.yaml
@@ -2,7 +2,7 @@ name: MS SQL Server Cluster
type: msSqlClusterServer
description: >-
- The MS SQL Failover Cluster installs
+ The MS SQL Failover Cluster installs
Microsoft SQL Failover Cluster Server
unitTemplates:
@@ -25,14 +25,11 @@ 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
description: >-
- Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
+ Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
underline are allowed.
minLength: 2
maxLength: 64
@@ -46,14 +43,18 @@ forms:
descriptionTitle: Passwords
description: >-
Windows requires strong password for service administration.
- Your password should have at least one letter in each
- register, a number and a special character. Password length should be
+ Your password should have at least one letter in each
+ register, a number and a special character. Password length should be
a minimum of 7 characters.
- name: externalAD
type: boolean
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
@@ -71,7 +72,7 @@ forms:
label: Domain
enabled: {YAQL: not $.serviceConfiguration.externalAD}
description: >-
- Service can be joined to the Active Directory domain. If you want to
+ Service can be joined to the Active Directory domain. If you want to
create an AD domain create the AD Service first.
helpText: Optional field for a domain to which service can be joined
- name: mixedModeAuth
@@ -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.
@@ -147,8 +152,8 @@ forms:
label: Hostname template
description: >-
For your convenience all instance hostnames can be named
- in the same way. Enter a name and use # character for incrementation.
- For example, host# turns into host1, host2, etc. Please follow Windows
+ in the same way. Enter a name and use # character for incrementation.
+ For example, host# turns into host1, host2, etc. Please follow Windows
hostname restrictions.
required: false
regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
@@ -214,14 +219,15 @@ forms:
type: flavor
label: Instance flavor
description: >-
- Select registered in Openstack flavor. Consider that service performance
+ Select registered in Openstack flavor. Consider that service performance
depends on this parameter.
required: false
- name: osImage
type: image
+ imageType: windows
label: Instance image
description: >-
- Select valid image for a service. Image should already be prepared and
+ Select valid image for a service. Image should already be prepared and
registered in glance.
- name: availabilityZone
type: azone
diff --git a/Services/ui_forms/MsSqlServer.yaml b/Services/ui_forms/MsSqlServer.yaml
index eb15503..aef7538 100644
--- a/Services/ui_forms/MsSqlServer.yaml
+++ b/Services/ui_forms/MsSqlServer.yaml
@@ -2,7 +2,7 @@ name: MS SQL Server
type: msSqlServer
description: >-
- The MS SQL Service installs an instance of
+ The MS SQL Service installs an instance of
Microsoft SQL Server
unitTemplates:
@@ -17,14 +17,11 @@ forms:
hidden: true
attributeNames: false
description: MS SQL Server
- # temporaryHack
- widgetMedia:
- js: [muranodashboard/js/mixed-mode.js]
- name: name
type: string
label: Service Name
description: >-
- Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
+ Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
underline are allowed.
minLength: 2
maxLength: 64
@@ -43,15 +40,15 @@ forms:
descriptionTitle: Passwords
description: >-
Windows requires strong password for service administration.
- Your password should have at least one letter in each
- register, a number and a special character. Password length should be
+ Your password should have at least one letter in each
+ register, a number and a special character. Password length should be
a minimum of 7 characters.
- name: domain
type: domain
label: Domain
required: false
description: >-
- Service can be joined to the Active Directory domain. If you want to
+ Service can be joined to the Active Directory domain. If you want to
create an AD domain create the AD Service first.
helpText: Optional field for a domain to which service can be joined
- name: mixedModeAuth
@@ -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
@@ -75,8 +76,8 @@ forms:
label: Hostname template
description: >-
For your convenience all instance hostnames can be named
- in the same way. Enter a name and use # character for incrementation.
- For example, host# turns into host1, host2, etc. Please follow Windows
+ in the same way. Enter a name and use # character for incrementation.
+ For example, host# turns into host1, host2, etc. Please follow Windows
hostname restrictions.
required: false
regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
@@ -98,14 +99,15 @@ forms:
type: flavor
label: Instance flavor
description: >-
- Select registered in Openstack flavor. Consider that service performance
+ Select registered in Openstack flavor. Consider that service performance
depends on this parameter.
required: false
- name: osImage
type: image
+ imageType: windows
label: Instance image
description: >-
- Select valid image for a service. Image should already be prepared and
+ Select valid image for a service. Image should already be prepared and
registered in glance.
- name: availabilityZone
type: azone
diff --git a/Services/ui_forms/WebServer.yaml b/Services/ui_forms/WebServer.yaml
index 7a8d9dc..b9f917e 100644
--- a/Services/ui_forms/WebServer.yaml
+++ b/Services/ui_forms/WebServer.yaml
@@ -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
diff --git a/Services/ui_forms/WebServerFarm.yaml b/Services/ui_forms/WebServerFarm.yaml
index 1ce2297..9d0d654 100644
--- a/Services/ui_forms/WebServerFarm.yaml
+++ b/Services/ui_forms/WebServerFarm.yaml
@@ -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
diff --git a/etc/murano-repository.conf b/etc/murano-repository.conf
index 530ae7e..78ed421 100644
--- a/etc/murano-repository.conf
+++ b/etc/murano-repository.conf
@@ -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
diff --git a/muranorepository/cmd/run.py b/muranorepository/cmd/run.py
index 88d79c6..1728794 100644
--- a/muranorepository/cmd/run.py
+++ b/muranorepository/cmd/run.py
@@ -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,
diff --git a/muranorepository/config.py b/muranorepository/config.py
index 34575e7..08659c3 100644
--- a/muranorepository/config.py
+++ b/muranorepository/config.py
@@ -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 = []
diff --git a/requirements.txt b/requirements.txt
index 0b6d5b5..8eb452c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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
diff --git a/setup.py b/setup.py
index 55f2cea..31eba50 100644
--- a/setup.py
+++ b/setup.py
@@ -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)