[PATCH conductor] Fixes box-sizing css issue appearing in chrome when included in table-like displayed div
by Jirka Tomasek
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
src/app/stylesheets/layout.scss | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index 5417d36..1ba5a8c 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -2732,7 +2732,6 @@ ul.catalog_pretty {
&:only-child div.summary{ -webkit-border-radius: 7px 7px 7px 7px; -moz-border-radius: 7px 7px 7px 7px; border-radius: 7px 7px 7px 7px; }
&:only-child div.details{ -webkit-border-radius: 0px 0px 7px 7px; -moz-border-radius: 0px 0px 7px 7px; border-radius: 0px 0px 7px 7px; }
div.summary{
- padding: 10px;
background-color: #efefef;
background: -moz-linear-gradient(top, #efefef 0%, #e0e0e0 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#efefef), color-stop(100%,#e0e0e0)); /* Chrome,Safari4+ */
@@ -2743,9 +2742,9 @@ ul.catalog_pretty {
background: linear-gradient(top, #efefef 0%,#e0e0e0 100%); /* W3C */
display: table;
width: 100%;
- box-sizing: border-box; -webkit-box-sizing:border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box;
div.controls{
+ padding: 10px;
text-align: right;
display: table-cell;
vertical-align: middle;
@@ -2755,8 +2754,8 @@ ul.catalog_pretty {
}
div.info{
- padding-left: 32px;
- background: transparent url('../../images/deployment_large_icon_provider.png') no-repeat left center;
+ padding: 10px 10px 10px 42px;
+ background: transparent url('../../images/deployment_large_icon_provider.png') no-repeat 10px center;
h2{ font-size: 16px; }
display: table-cell;
vertical-align: middle;
--
1.7.7.4
12 years, 3 months
[PATCH conductor] More user friendly certs status in provider accounts form
by Jirka Tomasek
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
.../provider_accounts/_provider_form.html.haml | 46 +++++++++----------
src/config/locales/en.yml | 1 +
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/app/views/provider_accounts/_provider_form.html.haml b/src/app/views/provider_accounts/_provider_form.html.haml
index 1553c5f..56b7e74 100644
--- a/src/app/views/provider_accounts/_provider_form.html.haml
+++ b/src/app/views/provider_accounts/_provider_form.html.haml
@@ -1,31 +1,29 @@
-%fieldset
- %p
- = label :provider_account, t('provider_accounts.index.provider_account_name')
- = text_field :provider_account, :label, :class => 'em long'
+%p
+ = label :provider_account, t('provider_accounts.index.provider_account_name')
+ = text_field :provider_account, :label, :class => 'em long'
- CredentialDefinition::CREDENTIAL_DEFINITIONS_ORDER.each do |cred_order|
- @provider_account.all_credentials((a)provider).each do |cred|
- if cred_order == cred.credential_definition.name
- %fieldset
- %p
- = label_tag cred.credential_definition.label
- - if cred.credential_definition.input_type == "password"
- = password_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", cred.value
- - elsif cred.credential_definition.input_type == "file"
- = file_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", :value => cred.value
- - else
- = text_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", cred.value
+ %p
+ = label_tag cred.credential_definition.label
+ - if cred.credential_definition.input_type == "password"
+ = password_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", cred.value
+ - elsif cred.credential_definition.input_type == "file"
+ %span.text_instead_input= t("provider_accounts.edit.file_already_uploaded") if cred.value
+ = file_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", :value => cred.value
+ - else
+ = text_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", cred.value
-%fieldset
- %p
- = label :provider_account, t('provider_accounts.index.priority')
- = text_field :provider_account, :priority, :class => 'em'
- %p
- = label_tag t("quotas.quota")
- = text_field :quota, :maximum_running_instances, :title => t('provider_accounts.form.quota_instances'), :value => @quota.maximum_running_instances || t('provider_accounts.properties.unlimited'), :id => "quota_instances"
- (
- %button.linkbutton.nospace{ :type => 'button', :onclick => "set_unlimited_quota(\"quota_instances\");" }<>
- = t('provider_accounts.form.unlimited_quota')
- )
+%p
+ = label :provider_account, t('provider_accounts.index.priority')
+ = text_field :provider_account, :priority, :class => 'em'
+%p
+ = label_tag t("quotas.quota")
+ = text_field :quota, :maximum_running_instances, :title => t('provider_accounts.form.quota_instances'), :value => @quota.maximum_running_instances || t('provider_accounts.properties.unlimited'), :id => "quota_instances"
+ (
+ %button.linkbutton.nospace{ :type => 'button', :onclick => "set_unlimited_quota(\"quota_instances\");" }<>
+ = t('provider_accounts.form.unlimited_quota')
+ )
:javascript
function set_unlimited_quota(elem_id) {
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index b1feea1..83f46fa 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -976,6 +976,7 @@ en:
required_field: Required field.
account: "Account:"
delete_account: Delete Account
+ file_already_uploaded: "Already uploaded. Reupload?"
show:
account: "Account:"
test_connection: Test Connection
--
1.7.7.4
12 years, 3 months
[PATCH configure] BZ 773037 - update RHEVM configuration to support data centers
by Richard Su
To support data centers, the RHEVM provider URL is now in this form:
https://rhevm-rest-api-server:port/api;datacenter-uuid
Removed rhevm_deltacloud_provider configuration parameter and replaced
it with rhevm_deltacloud_api which represents the url to the REST API
and with rhevm_deltacloud_data_center which represents the data center
uuid.
In the example above,
rhevm_deltacloud_api = https://rhevm-rest-api-server:port/api
rhevm_deltacloud_data_center = datacenter-uuid
---
conf/rhevm_configure | 3 ++-
recipes/aeolus/manifests/profiles/rhevm.pp | 7 ++++---
recipes/aeolus/templates/rhevm.json | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/conf/rhevm_configure b/conf/rhevm_configure
index 860c079..d352bed 100644
--- a/conf/rhevm_configure
+++ b/conf/rhevm_configure
@@ -10,7 +10,8 @@ parameters:
# rhevm_nfs_mount_point: /mnt/rhevm-nfs
# rhevm_deltacloud_username: username@fqdn
# rhevm_deltacloud_password: password
-# rhevm_deltacloud_provider: https://rhevm.server.com:8443/api
+# rhevm_deltacloud_api: https://rhevm.server.com:8443/api
+# rhevm_deltacloud_data_center: data center uuid
# rhevm_push_timeout: 1800
classes:
- aeolus::conductor
diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp
index 942fef1..eddba26 100644
--- a/recipes/aeolus/manifests/profiles/rhevm.pp
+++ b/recipes/aeolus/manifests/profiles/rhevm.pp
@@ -18,7 +18,8 @@ class aeolus::profiles::rhevm {
"rhevm_nfs_mount_point",
"rhevm_deltacloud_username",
"rhevm_deltacloud_password",
- "rhevm_deltacloud_provider",
+ "rhevm_deltacloud_api",
+ "rhevm_deltacloud_data_center",
"rhevm_push_timeout")
if $missing {
@@ -31,7 +32,7 @@ class aeolus::profiles::rhevm {
require => Package['aeolus-conductor-daemons'] }
web_request{ "rhevm-check-export-path-is-export-type":
- get => "$rhevm_deltacloud_provider/storagedomains?search=export",
+ get => "$rhevm_deltacloud_api/storagedomains?search=export",
username => "$rhevm_deltacloud_username",
password => "$rhevm_deltacloud_password",
returns => '200',
@@ -62,7 +63,7 @@ class aeolus::profiles::rhevm {
aeolus::conductor::provider{"rhevm":
deltacloud_driver => "rhevm",
url => "http://localhost:3002/api",
- deltacloud_provider => "$rhevm_deltacloud_provider",
+ deltacloud_provider => "$rhevm_deltacloud_api;$rhevm_deltacloud_data_center",
require => Aeolus::Conductor::Login["admin"] }
aeolus::conductor::provider::account{"rhevm":
diff --git a/recipes/aeolus/templates/rhevm.json b/recipes/aeolus/templates/rhevm.json
index 6f79ccd..14d1009 100644
--- a/recipes/aeolus/templates/rhevm.json
+++ b/recipes/aeolus/templates/rhevm.json
@@ -5,7 +5,7 @@
"nfs-dir": "<%= rhevm_nfs_mount_point %>",
"nfs-path": "<%= rhevm_nfs_export %>",
"nfs-host": "<%= rhevm_nfs_server %>",
- "api-url": "<%= rhevm_deltacloud_provider %>",
+ "api-url": "<%= rhevm_deltacloud_api %>",
"password": "<%= rhevm_deltacloud_password %>",
"cluster": "_any_",
"timeout": <%= rhevm_push_timeout %>
--
1.7.6.5
12 years, 3 months
Proposal: Aeolus Project blog
by Matt Wagner
Hi all,
I was thinking that we should really have a blog for the project. Not a
rarely-updated blog where we post occasional major release
announcements, but a blog where everyone has an account and posts all
the time -- new features that are implemented, guides and tutorials,
etc.
I don't want to do this unless it's something that multiple people in
the community would get behind and help maintain, though.
My thinking is that we should just use a free WordPress account[1], and
set up everyone who wants to contribute with an account on it.
We do have an existing Blogroll (temporarily non-functional, apparently)
in Redmine, but I think we should maybe have an official project blog,
and then use Blogroll to include that and other relevant posts.
We could potentially then replace the "News" blurb on our homepage with
a slick JS widget that pulls an RSS feed from the blog.
What do you all think of this plan? Is this something we should do?
-- Matt
[1] http://en.wordpress.com/features/
12 years, 3 months
[PATCH conductor] Changed version of rubygem-rake to 0.9.2.2 in Gemfile.lock
by jzigmund@redhat.com
From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/Gemfile.lock | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Gemfile.lock b/src/Gemfile.lock
index 1c19f6a..c4b5667 100644
--- a/src/Gemfile.lock
+++ b/src/Gemfile.lock
@@ -111,7 +111,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
- rake (0.9.2)
+ rake (0.9.2.2)
rdoc (3.8)
regin (0.3.8)
rest-client (1.6.1)
--
1.7.7.5
12 years, 3 months
[PATCH conductor] BZ#766929 - database.yml is world-readable
by John Eckersberg
https://bugzilla.redhat.com/show_bug.cgi?id=766929
---
aeolus-conductor.spec.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index 51a487c..53e1894 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -287,6 +287,7 @@ fi
%{app_root}/config/database.pg
%{app_root}/config/database.sqlite
%config %{app_root}/config/*.yml
+%attr(660, aeolus, aeolus) %{app_root}/config/database.yml
%{app_root}/config.ru
%{app_root}/db
%{app_root}/dbomatic
--
1.7.7.4
12 years, 3 months
[PATCH aeolus-cli] BZ#772274 Fixed --help Option
by Martyn Taylor
From: Martyn Taylor <mtaylor(a)redhat.com>
---
lib/aeolus_cli/command/config_parser.rb | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/aeolus_cli/command/config_parser.rb b/lib/aeolus_cli/command/config_parser.rb
index ff1172d..e74401d 100644
--- a/lib/aeolus_cli/command/config_parser.rb
+++ b/lib/aeolus_cli/command/config_parser.rb
@@ -36,7 +36,7 @@ module Aeolus
# File.expand_path("~")
if COMMANDS.include?(@command)
opts = self.send((@command + "Options").to_sym)
- if @args.include?('-h')
+ if @args.include?('-h') || @args.include?('--help')
puts opts
else
parse(opts)
@@ -166,7 +166,7 @@ module Aeolus
opts.on('-A', '--account NAME,NAME', Array, 'name of specific provider account to use for push') do |name|
@options[:account] = name
end
- opts.on( '-h', '--help', 'Get usage information for this command')
+
opts.separator ""
opts.separator "Examples:"
@@ -301,7 +301,6 @@ module Aeolus
status_command = StatusCommand.new(@options)
status_command.run
end
-
end
end
end
\ No newline at end of file
--
1.7.6.4
12 years, 3 months