Skip to content
This repository was archived by the owner on Dec 4, 2018. It is now read-only.

Fix schema and template broken in PR#218 #219

Merged
merged 1 commit into from
Jun 10, 2015
Merged

Fix schema and template broken in PR#218 #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions chef/cookbooks/nova_dashboard/templates/default/local_settings.py.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,16 +293,16 @@ TIME_ZONE = "<%= @timezone %>"
<% if @policy_file_path.empty? -%>
#POLICY_FILES_PATH = os.path.join(ROOT_PATH, 'conf')
<% else -%>
POLICY_FILES_PATH = '<%= @policy_file_path =>'
POLICY_FILES_PATH = '<%= @policy_file_path %>'
<% end -%>
# Map of local copy of service policy files
POLICY_FILES = {
'identity': '<%= @policy_file[:identity] =>',
'compute': '<%= @policy_file[:compute] =>',
'volume': '<%= @policy_file[:volume] =>',
'image': '<%= @policy_file[:image] =>',
'orchestration': '<%= @policy_file[:orchestration] =>',
'network': '<%= @policy_file[:network] =>',
'identity': '<%= @policy_file[:identity] %>',
'compute': '<%= @policy_file[:compute] %>',
'volume': '<%= @policy_file[:volume] %>',
'image': '<%= @policy_file[:image] %>',
'orchestration': '<%= @policy_file[:orchestration] %>',
'network': '<%= @policy_file[:network] %>',
}

# Trove user and database extension support. By default support for
Expand Down
18 changes: 11 additions & 7 deletions chef/data_bags/crowbar/bc-template-nova_dashboard.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,17 @@
},
"policy_file_path" : { "type": "str", "required": true },
"policy_file" : {
"identity" : { "type": "str", "required": true },
"compute" : { "type": "str", "required": true },
"volume" : { "type": "str", "required": true },
"image" : { "type": "str", "required": true },
"orchestration" : { "type": "str", "required": true },
"network" : { "type": "str", "required": true }
},
"type" : "map",
"required" : true,
"mapping": {
"identity" : { "type": "str", "required": true },
"compute" : { "type": "str", "required": true },
"volume" : { "type": "str", "required": true },
"image" : { "type": "str", "required": true },
"orchestration" : { "type": "str", "required": true },
"network" : { "type": "str", "required": true }
}
},
"can_set_mount_point": { "type": "bool", "required": false },
"can_set_password": { "type": "bool", "required": false },
"use_keystone_v3": { "type": "bool", "required": true },
Expand Down