staypuft 0.1.3 → 0.1.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +13 -5
  2. data/app/helpers/staypuft/deployments_helper.rb +34 -7
  3. data/app/models/staypuft/service/ui_params.rb +0 -4
  4. data/app/views/staypuft/deployments/show.html.erb +3 -12
  5. data/app/views/staypuft/steps/deployment_settings.html.erb +22 -44
  6. data/lib/staypuft/version.rb +1 -1
  7. metadata +66 -65
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 0299f2c0c0f5688c0888e4922af7b801fc25acb1
4
- data.tar.gz: 09e4b6abd6aaa3baff6686ce5db178894da200c7
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ MjZjYmFjYjRkM2Y2OTIyNjcxMTNlOTgyM2Q5ZjVlZTU2YjAyMjg2Yg==
5
+ data.tar.gz: !binary |-
6
+ NjBjYmFmYmVkNDAwYzMwN2YzMWI0NWNkMzJjNGUwZGYwZTJmMzRmNA==
5
7
  SHA512:
6
- metadata.gz: 46eb5d18b1961d13a84cf31a05dad134bb965eb9dcde61a6337a728d8ace30ca74a79bcc24a6345e4dd83b635b5cfc8a7f5a4825a5e37cc101ce5d889bc44452
7
- data.tar.gz: d4fbc9a6f3aae0d03486439fa1c62eefb3f9e09a135f6b0bd2ae2636d38d1e7e33994cc5eeafcb126931128524438a9b224cc32da15642d99caa6e114e193961
8
+ metadata.gz: !binary |-
9
+ MTg2MmM0MmUxMTFhM2EyODA3OGJlNDc5MDgyN2Y4YzhlNzNiYmUzMjMxODNk
10
+ NmFlMGYwMGRhZDVkOTYwZGMyOGRiNDgzNjYwZDBlOWJkMDk4MWJmYmJmMjE2
11
+ Y2U1NTEwOGU3MjAzMjgyZjk3N2U2NGZiNWY3MjgxYTA4MDNiYTY=
12
+ data.tar.gz: !binary |-
13
+ NmZkMzE0YzhlMDE2MGMyYWIyNmUzMGVmNGU5M2Q0MGYxM2FmYzRiNmU4Njk3
14
+ MDk4ZGRkNmQ3NWU2ZjVkZjZmNjg0NGI4OTcxZjc3ZjVjMDUwM2U0YmI5ZDdi
15
+ ZDcxOGM4Y2Y1MjgzNDkwZjczMWM3NjkwNjk2OTBlYzdjZGQ4YmI=
data/app/helpers/staypuft/deployments_helper.rb CHANGED
@@ -2,10 +2,10 @@ module Staypuft
2
2
  module DeploymentsHelper
3
3
  def deployment_wizard(step)
4
4
  wizard_header(
5
- step,
6
- _("Deployment Settings"),
7
- _("Services Selection"),
8
- _("Services Configuration")
5
+ step,
6
+ _("Deployment Settings"),
7
+ _("Services Selection"),
8
+ _("Services Configuration")
9
9
  )
10
10
  end
11
11
 
@@ -16,11 +16,38 @@ module Staypuft
16
16
  def alert_if_deployed
17
17
  if @deployment.deployed?
18
18
  (alert :class => 'alert-warning',
19
- :text => _('Machines are already deployed with this configuration. Changing the configuration parameters
20
- is unsupported and may result in an unusable configuration. <br/>Please proceed with caution.'),
21
- :close => false).html_safe
19
+ :text => _('Machines are already deployed with this configuration. Changing the configuration parameters ' +
20
+ 'is unsupported and may result in an unusable configuration. <br/>Please proceed with caution.'),
21
+ :close => false).html_safe
22
22
  end
23
23
  end
24
24
 
25
+ def host_label(host)
26
+ case host
27
+ when Host::Managed
28
+ style ="label-info"
29
+ short = s_("Managed|M")
30
+ label = _('Known Host')
31
+ path = hash_for_host_path(host)
32
+ when Host::Discovered
33
+ style ="label-default"
34
+ short = s_("Discovered|D")
35
+ label = _('Discovered Host')
36
+ # TODO remove after migrating to foreman_discover 1.3.0
37
+ hash_for_method = [:hash_for_discovered_host_path, :hash_for_discover_path].find { |m| respond_to? m }
38
+ path = send hash_for_method, host
39
+ else
40
+ style = 'label-warning'
41
+ short = s_("Error|E")
42
+ path = '#'
43
+ label = _('Unknown Host')
44
+ end
45
+
46
+ content_tag(:span, short,
47
+ { :rel => "twipsy",
48
+ :class => "label label-light " + style,
49
+ :"data-original-title" => _(label) }) + link_to(trunc(" #{host}", 32), path)
50
+ end
25
51
  end
52
+
26
53
  end
data/app/models/staypuft/service/ui_params.rb CHANGED
@@ -43,8 +43,6 @@ Staypuft::Service::UI_PARAMS = {
43
43
  'swift_storage_ips'],
44
44
  'Neutron (Controller)' => ['admin_email',
45
45
  'admin_password',
46
- 'cisco_nexus_plugin',
47
- 'cisco_vswitch_plugin',
48
46
  'controller_admin_host',
49
47
  'controller_priv_host',
50
48
  'controller_pub_host',
@@ -69,8 +67,6 @@ Staypuft::Service::UI_PARAMS = {
69
67
  'neutron_db_password',
70
68
  'neutron_metadata_proxy_secret',
71
69
  'neutron_user_password',
72
- 'nexus_config',
73
- 'nexus_credentials',
74
70
  'nova_db_password',
75
71
  'nova_user_password',
76
72
  'nova_default_floating_pool',
data/app/views/staypuft/deployments/show.html.erb CHANGED
@@ -111,8 +111,7 @@
111
111
  </th>
112
112
  <th><%= sort :name, :as => _('Name') %></th>
113
113
  <th class="hidden-s hidden-xs"><%= _('Deployed?') %></th>
114
- <th class="hidden-s hidden-xs"><%= sort :mac, :as => _('MAC Address') %></th>
115
- <th class="hidden-s hidden-xs"><%= sort :type, :as => _('Type') %></th>
114
+ <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
116
115
  </tr>
117
116
  </thead>
118
117
  <tbody>
@@ -131,14 +130,7 @@
131
130
  <%= hidden_field_tag 'host_ids[]', host.id if disabled %>
132
131
  </td>
133
132
  <td class="ellipsis">
134
- <% case host %>
135
- <% when Host::Managed %>
136
- <%= link_to_if_authorized host.name, hash_for_host_path(host) %>
137
- <% when Host::Discovered %>
138
- <%= link_to_if_authorized host.name, hash_for_discover_path(host) %>
139
- <% else %>
140
- <%= host.name %>
141
- <% end %>
133
+ <%= host_label(host) %>
142
134
  </td>
143
135
  <td class="hidden-s hidden-xs">
144
136
  <% if host.open_stack_deployed? %>
@@ -147,8 +139,7 @@
147
139
  <span class="glyphicon glyphicon-minus"></span>
148
140
  <% end %>
149
141
  </td>
150
- <td class="hidden-s hidden-xs"><%= host.mac %></td>
151
- <td class="hidden-s hidden-xs"><%= host.type %></td>
142
+ <td class="hidden-s hidden-xs"><%= host.ip %></td>
152
143
  </tr>
153
144
  <% end %>
154
145
  </tbody>
data/app/views/staypuft/steps/deployment_settings.html.erb CHANGED
@@ -8,58 +8,36 @@
8
8
  <%= deployment_wizard 1 %>
9
9
  </div>
10
10
 
11
- <%= text_f f, :name %><br />
12
- <%= textarea_f f, :description, :rows => 3 %><br />
11
+ <%= text_f f, :name %>
12
+ <%= textarea_f f, :description, :rows => 3 %>
13
13
 
14
- <div class="row">
15
- <div class="clearfix">
16
- <div class="form-group">
17
- <label class="col-md-2 control-label" for="layout_id"><%= _("Deployment Layout") %></label>
18
- <div class="col-md-6">
19
- <% @layouts.each do |layout| %>
20
- <%= radio_button_f_non_inline(f, :layout_id, :checked => layout.id == @deployment.layout_id,:value=>layout.id, :text=> "#{layout.name}, #{layout.networking.capitalize} " + _("Networking")) %>
21
- <% end %>
22
- </div>
23
- </div>
24
- <div class="form-group">
25
- <label class="col-md-2 control-label" for="layout_id"><%= _("AMQP Provider") %></label>
26
- <div class="col-md-6">
27
- <% Staypuft::Deployment::AMQP_PROVIDER_LABELS.each do |provider_value, provider_label| %>
28
- <%= radio_button_f_non_inline(f, :amqp_provider, :checked => provider_value == @deployment.amqp_provider,:value=>provider_value, :text=> provider_label) %>
29
- <% end %>
30
- </div>
31
- </div>
32
- </div>
33
- </div>
14
+ <%= field(f, :layout_id, :label => _('Deployment Layout')) do
15
+ @layouts.map do |layout|
16
+ radio_button_f_non_inline(f, :layout_id,
17
+ :checked => layout.id == @deployment.layout_id,
18
+ :value => layout.id,
19
+ :text => "#{layout.name}, #{layout.networking.capitalize} " + _("Networking"))
20
+ end.join
21
+ end %>
22
+
23
+ <%= field(f, :layout_id, :label => _('Messaging provider')) do
24
+ Staypuft::Deployment::AMQP_PROVIDER_LABELS.map do |provider_value, provider_label|
25
+ radio_button_f_non_inline(f, :amqp_provider,
26
+ :checked => provider_value == @deployment.amqp_provider,
27
+ :value => provider_value,
28
+ :text => provider_label)
29
+ end.join
30
+ end %>
34
31
 
35
- <!-- <div class="row">
36
- <%= f.label :services_password, _("Services Password"), :class => "col-md-2 control-label" %><br />
37
- <div class="row">
38
- <div class="col-md-8">
39
- <%= f.radio_button :services_password, false, :checked => true %>
40
- <%= f.label :services_password, _("Use single password for all services"), :value => "single_password" %><br />
41
- <div class="row">
42
- <%= f.label :password, _("Password*"), :class=>"col-md-3 control-label"%>
43
- <%= f.password_field :password, :class=>"col-md-5" %>
44
- </div><br />
45
- <div class="row">
46
- <%= f.label :confirm_password, _("Confirm Password*"), :class=>"col-md-3 control-label" %>
47
- <%= f.password_field :confirm_password, :class=>"col-md-5" %>
48
- </div><br />
49
- <%= f.radio_button :services_password, false, :checked => false %>
50
- <%= f.label :services_password, _("Generate random passwords for all services"), :value => "random_password" %>
51
- </div>
52
- </div>
53
- </div>
54
- -->
55
32
  <div class="form_actions">
56
33
  <% if !is_new %>
57
34
  <%= link_to _("Cancel"), deployment_path(@deployment),
58
35
  :class => "btn btn-danger" %>
59
36
  <% else %>
60
- <%= link_to _("Cancel"), deployment_path(@deployment), :method => :delete,
37
+ <%= link_to _("Cancel"), deployment_path(@deployment),
38
+ :method => :delete,
61
39
  :confirm => _("This will clear whole deployment configuration. Are you sure?"),
62
- :class => "btn btn-danger" %>
40
+ :class => "btn btn-danger" %>
63
41
  <% end %>
64
42
  <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
65
43
  <%= _("Next") %>
data/lib/staypuft/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Staypuft
2
- VERSION = '0.1.3'
2
+ VERSION = '0.1.4'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: staypuft
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Staypuft team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-16 00:00:00.000000000 Z
11
+ date: 2014-06-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: foreman-tasks
@@ -42,14 +42,14 @@ dependencies:
42
42
  name: wicked
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ! '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
@@ -73,87 +73,87 @@ executables: []
73
73
  extensions: []
74
74
  extra_rdoc_files: []
75
75
  files:
76
- - app/overrides/hide_subscription_manager_passwords.rb
77
- - app/helpers/staypuft/application_helper.rb
78
- - app/helpers/staypuft/deployments_helper.rb
76
+ - LICENSE
77
+ - README.md
78
+ - Rakefile
79
79
  - app/assets/javascripts/staypuft/staypuft.js
80
- - app/assets/stylesheets/staypuft/staypuft.css.scss
81
80
  - app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss
82
- - app/models/staypuft/service.rb
83
- - app/models/staypuft/role_class.rb
84
- - app/models/staypuft/deployment.rb
85
- - app/models/staypuft/role_service.rb
86
- - app/models/staypuft/deployment_role_hostgroup.rb
87
- - app/models/staypuft/layout.rb
88
- - app/models/staypuft/service_class.rb
81
+ - app/assets/stylesheets/staypuft/staypuft.css.scss
82
+ - app/controllers/staypuft/application_controller.rb
83
+ - app/controllers/staypuft/deployments_controller.rb
84
+ - app/controllers/staypuft/steps_controller.rb
85
+ - app/helpers/staypuft/application_helper.rb
86
+ - app/helpers/staypuft/deployments_helper.rb
87
+ - app/lib/actions/staypuft/deployment/deploy.rb
88
+ - app/lib/actions/staypuft/deployment/populate.rb
89
+ - app/lib/actions/staypuft/host/build.rb
90
+ - app/lib/actions/staypuft/host/create.rb
91
+ - app/lib/actions/staypuft/host/deploy.rb
92
+ - app/lib/actions/staypuft/host/puppet_run.rb
93
+ - app/lib/actions/staypuft/host/wait_until_host_ready.rb
94
+ - app/lib/actions/staypuft/host/wait_until_installed.rb
95
+ - app/lib/actions/staypuft/hostgroup/deploy.rb
96
+ - app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
97
+ - app/lib/actions/staypuft/middleware/as_current_user.rb
98
+ - app/lib/staypuft/deployment_param_exporter.rb
99
+ - app/lib/staypuft/deployment_param_importer.rb
100
+ - app/lib/staypuft/exception.rb
101
+ - app/models/setting/staypuft_provisioning.rb
102
+ - app/models/staypuft/concerns/environment_extensions.rb
103
+ - app/models/staypuft/concerns/host_open_stack_affiliation.rb
89
104
  - app/models/staypuft/concerns/host_orchestration_build_hook.rb
90
105
  - app/models/staypuft/concerns/hostgroup_extensions.rb
91
- - app/models/staypuft/concerns/host_open_stack_affiliation.rb
92
106
  - app/models/staypuft/concerns/puppetclass_extensions.rb
93
- - app/models/staypuft/concerns/environment_extensions.rb
107
+ - app/models/staypuft/deployment.rb
108
+ - app/models/staypuft/deployment_role_hostgroup.rb
109
+ - app/models/staypuft/layout.rb
94
110
  - app/models/staypuft/layout_role.rb
95
- - app/models/staypuft/service/ui_params.rb
96
111
  - app/models/staypuft/role.rb
97
- - app/models/setting/staypuft_provisioning.rb
98
- - app/lib/staypuft/deployment_param_importer.rb
99
- - app/lib/staypuft/exception.rb
100
- - app/lib/staypuft/deployment_param_exporter.rb
101
- - app/lib/actions/staypuft/middleware/as_current_user.rb
102
- - app/lib/actions/staypuft/hostgroup/deploy.rb
103
- - app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
104
- - app/lib/actions/staypuft/host/deploy.rb
105
- - app/lib/actions/staypuft/host/build.rb
106
- - app/lib/actions/staypuft/host/wait_until_host_ready.rb
107
- - app/lib/actions/staypuft/host/puppet_run.rb
108
- - app/lib/actions/staypuft/host/create.rb
109
- - app/lib/actions/staypuft/host/wait_until_installed.rb
110
- - app/lib/actions/staypuft/deployment/deploy.rb
111
- - app/lib/actions/staypuft/deployment/populate.rb
112
- - app/controllers/staypuft/steps_controller.rb
113
- - app/controllers/staypuft/deployments_controller.rb
114
- - app/controllers/staypuft/application_controller.rb
112
+ - app/models/staypuft/role_class.rb
113
+ - app/models/staypuft/role_service.rb
114
+ - app/models/staypuft/service.rb
115
+ - app/models/staypuft/service/ui_params.rb
116
+ - app/models/staypuft/service_class.rb
117
+ - app/overrides/hide_subscription_manager_passwords.rb
118
+ - app/views/staypuft/deployments/_import_form.html.erb
115
119
  - app/views/staypuft/deployments/index.html.erb
116
120
  - app/views/staypuft/deployments/show.html.erb
117
- - app/views/staypuft/deployments/_import_form.html.erb
118
121
  - app/views/staypuft/deployments/summary.html.erb
119
122
  - app/views/staypuft/layouts/staypuft.html.erb
120
- - app/views/staypuft/steps/deployment_settings.html.erb
121
- - app/views/staypuft/steps/services_selection.html.erb
122
123
  - app/views/staypuft/steps/_title.html.erb
124
+ - app/views/staypuft/steps/deployment_settings.html.erb
123
125
  - app/views/staypuft/steps/services_configuration.html.erb
124
- - config/staypuft.local.rb
126
+ - app/views/staypuft/steps/services_selection.html.erb
125
127
  - config/routes.rb
126
- - db/migrate/20140312050615_create_staypuft_role_classes.rb
128
+ - config/staypuft.local.rb
127
129
  - db/migrate/20140309021811_create_staypuft_layouts.rb
128
- - db/migrate/20140310203855_create_staypuft_role_services.rb
130
+ - db/migrate/20140310004533_create_staypuft_deployments.rb
129
131
  - db/migrate/20140310023613_create_staypuft_roles.rb
130
- - db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
131
- - db/migrate/20140326032027_drop_staypuft_hostgroup_roles.rb
132
- - db/migrate/20140602121501_add_amqp_provider_to_staypuft_deployment.rb
132
+ - db/migrate/20140310174152_create_staypuft_layout_roles.rb
133
133
  - db/migrate/20140310194221_create_staypuft_services.rb
134
+ - db/migrate/20140310203855_create_staypuft_role_services.rb
135
+ - db/migrate/20140312044533_create_staypuft_deployment_role_hostgroups.rb
134
136
  - db/migrate/20140312050001_create_staypuft_hostgroup_roles.rb
135
- - db/migrate/20140310174152_create_staypuft_layout_roles.rb
137
+ - db/migrate/20140312050615_create_staypuft_role_classes.rb
138
+ - db/migrate/20140312051144_create_staypuft_service_classes.rb
139
+ - db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
136
140
  - db/migrate/20140318163222_add_deploy_order_to_staypuft_layout_role.rb
141
+ - db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
142
+ - db/migrate/20140326032027_drop_staypuft_hostgroup_roles.rb
137
143
  - db/migrate/20140507103716_add_form_step_to_staypuft_deployment.rb
138
144
  - db/migrate/20140513124807_change_column_default_form_step_on_staypuft_deployment.rb
139
- - db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
140
- - db/migrate/20140312051144_create_staypuft_service_classes.rb
141
- - db/migrate/20140312044533_create_staypuft_deployment_role_hostgroups.rb
142
- - db/migrate/20140310004533_create_staypuft_deployments.rb
145
+ - db/migrate/20140602121501_add_amqp_provider_to_staypuft_deployment.rb
143
146
  - db/seeds.rb
147
+ - lib/staypuft.rb
144
148
  - lib/staypuft/engine.rb
145
149
  - lib/staypuft/version.rb
146
- - lib/staypuft.rb
147
150
  - lib/tasks/staypuft_tasks.rake
148
- - LICENSE
149
- - Rakefile
150
- - README.md
151
- - test/test_helper.rb
152
- - test/staypuft_test.rb
153
- - test/unit/staypuft_test.rb
154
- - test/integration/navigation_test.rb
155
151
  - test/factories/staypuft_factories.rb
152
+ - test/integration/navigation_test.rb
153
+ - test/staypuft_test.rb
154
+ - test/test_helper.rb
156
155
  - test/test_plugin_helper.rb
156
+ - test/unit/staypuft_test.rb
157
157
  homepage: https://github.com/theforeman/staypuft
158
158
  licenses: []
159
159
  metadata: {}
@@ -163,24 +163,25 @@ require_paths:
163
163
  - lib
164
164
  required_ruby_version: !ruby/object:Gem::Requirement
165
165
  requirements:
166
- - - '>='
166
+ - - ! '>='
167
167
  - !ruby/object:Gem::Version
168
168
  version: '0'
169
169
  required_rubygems_version: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - '>='
171
+ - - ! '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  requirements: []
175
175
  rubyforge_project:
176
- rubygems_version: 2.0.3
176
+ rubygems_version: 2.2.2
177
177
  signing_key:
178
178
  specification_version: 4
179
179
  summary: OpenStack Foreman Installer
180
180
  test_files:
181
- - test/test_helper.rb
182
- - test/staypuft_test.rb
183
- - test/unit/staypuft_test.rb
184
- - test/integration/navigation_test.rb
185
181
  - test/factories/staypuft_factories.rb
182
+ - test/integration/navigation_test.rb
183
+ - test/staypuft_test.rb
184
+ - test/test_helper.rb
186
185
  - test/test_plugin_helper.rb
186
+ - test/unit/staypuft_test.rb
187
+ has_rdoc: