staypuft 0.5.0 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. checksums.yaml +8 -8
  2. data/app/assets/javascripts/staypuft/staypuft.js +41 -0
  3. data/app/controllers/staypuft/steps_controller.rb +1 -1
  4. data/app/lib/staypuft/network_query.rb +17 -6
  5. data/app/lib/staypuft/seeder.rb +50 -262
  6. data/app/models/staypuft/deployment.rb +8 -32
  7. data/app/models/staypuft/deployment/cinder_service.rb +5 -17
  8. data/app/models/staypuft/deployment/glance_service.rb +2 -9
  9. data/app/models/staypuft/deployment/neutron_service.rb +10 -2
  10. data/app/models/staypuft/deployment/nova_service.rb +11 -2
  11. data/app/models/staypuft/deployment/passwords.rb +2 -2
  12. data/app/models/staypuft/service.rb +1 -21
  13. data/app/views/staypuft/deployments/_deployment_access_all_details_dialogue.html.erb +7 -18
  14. data/app/views/staypuft/deployments/_deployment_hosts.html.erb +1 -1
  15. data/app/views/staypuft/deployments/_deployment_show_header.html.erb +1 -4
  16. data/app/views/staypuft/deployments/_free_hosts.html.erb +2 -2
  17. data/app/views/staypuft/deployments/_free_hosts_table.html.erb +2 -2
  18. data/app/views/staypuft/interface_assignments/_nics_assignment_overview.html.erb +40 -0
  19. data/app/views/staypuft/interface_assignments/index.html.erb +5 -39
  20. data/app/views/staypuft/steps/_cinder.html.erb +0 -1
  21. data/app/views/staypuft/steps/_neutron.html.erb +6 -3
  22. data/app/views/staypuft/steps/_nova.html.erb +3 -0
  23. data/app/views/staypuft/steps/deployment_settings.html.erb +1 -2
  24. data/app/views/staypuft/steps/services_configuration.html.erb +1 -0
  25. data/app/views/staypuft/steps/services_overview.html.erb +1 -2
  26. data/lib/staypuft/version.rb +1 -1
  27. metadata +5 -7
  28. data/app/models/staypuft/service/ui_params.rb +0 -128
  29. data/app/views/staypuft/steps/_neutron_non_ha.html.erb +0 -41
  30. data/app/views/staypuft/steps/_nova_non_ha.html.erb +0 -29
@@ -21,7 +21,6 @@
21
21
  :checked_value => 'true',
22
22
  :unchecked_value => 'false',
23
23
  :checked => @deployment.cinder.lvm_backend?,
24
- :group_class => @deployment.ha? ? "hide" : "",
25
24
  :text => _(Staypuft::Deployment::CinderService::DriverBackend::LABELS['lvm']))
26
25
  %>
27
26
 
@@ -1,9 +1,8 @@
1
1
  <%= f.fields_for :neutron, @deployment.neutron do |p| %>
2
2
  <%= base_errors_for @deployment.neutron %>
3
- <div class="form-group <%= @deployment.neutron.errors.empty? ? "" : 'has-error' %> hide"></div>
4
3
  <%= change_label_width(4, field(p, :network_segmentation, :label => _(Staypuft::Deployment::NeutronService::NetworkSegmentation::HUMAN)) do
5
4
  Staypuft::Deployment::NeutronService::NetworkSegmentation::LABELS.map do |value, label|
6
- radio_button_f_non_inline(p, :network_segmentation,
5
+ radio_button_f_non_inline(p, :network_segmentation, :class => "network_segmentation",
7
6
  :checked => @deployment.neutron.network_segmentation == value,
8
7
  :value => value,
9
8
  :text => label)
@@ -16,7 +15,7 @@
16
15
  help_inline: _(Staypuft::Deployment::NeutronService::TenantVlanRanges::HUMAN_AFTER)) %>
17
16
  </div>
18
17
 
19
- <%= change_label_width(4, field(p, :core_plugin, :label => _(Staypuft::Deployment::NeutronService::CorePlugin::HUMAN)) do
18
+ <%= change_label_width(3, field(p, :core_plugin, :label => _(Staypuft::Deployment::NeutronService::CorePlugin::HUMAN)) do
20
19
  Staypuft::Deployment::NeutronService::CorePlugin::LABELS.map do |value, label|
21
20
  radio_button_f_non_inline(p, :core_plugin,
22
21
  :checked => @deployment.neutron.core_plugin == value,
@@ -25,6 +24,10 @@
25
24
  end.join
26
25
  end) %>
27
26
 
27
+ <%= change_label_width 3, text_f(p, :network_device_mtu,
28
+ label: _(Staypuft::Deployment::NeutronService::Mtu::HUMAN),
29
+ help_inline: _(Staypuft::Deployment::NeutronService::Mtu::HUMAN_AFTER)) %>
30
+
28
31
  <div class="neutron_ml2_mechanisms inset_form hide">
29
32
  <%= _(Staypuft::Deployment::NeutronService::Ml2Mechanisms::HUMAN) %>
30
33
  <%= check_box_f_non_inline(p, :ml2_openvswitch,
@@ -20,4 +20,7 @@
20
20
  <%= change_label_width 4, text_f(p, :private_fixed_range,
21
21
  label: _(Staypuft::Deployment::NovaService::PrivateFixedRange::HUMAN),
22
22
  help_inline: _(Staypuft::Deployment::NovaService::PrivateFixedRange::HUMAN_AFTER)) %>
23
+ <%= change_label_width 4, text_f(p, :network_device_mtu,
24
+ label: _(Staypuft::Deployment::NovaService::Mtu::HUMAN),
25
+ help_inline: _(Staypuft::Deployment::NovaService::Mtu::HUMAN_AFTER)) %>
23
26
  <% end %>
@@ -12,8 +12,7 @@
12
12
  <%= text_f f, :name %>
13
13
  <%= textarea_f f, :description, :rows => 3 %>
14
14
 
15
- <% { layout_name: Staypuft::Deployment::LayoutName,
16
- networking: Staypuft::Deployment::Networking,
15
+ <% { networking: Staypuft::Deployment::Networking,
17
16
  amqp_provider: Staypuft::Deployment::AmqpProvider,
18
17
  platform: Staypuft::Deployment::Platform }.
19
18
  each do |attr, constants| %>
@@ -28,6 +28,7 @@
28
28
  %>
29
29
  <div class="tab-pane" id="<%= service_name %>">
30
30
  <h3><%= _("%s Service Configuration") % service_name.to_s.capitalize %></h3>
31
+ <div class="<%= "%s-controller-warning" % service_name.to_s %> alert alert-warning base in fade alert-dismissable hide"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><h4 class="alert-heading"><%= _("Warning") %></h4><li><%= _("Only one controller should be assigned when using this option.") %><span class="replace"></span></li></div>
31
32
  <%= render partial: service_name.to_s, locals: {f: f}%>
32
33
  </div>
33
34
  <% end %>
@@ -9,8 +9,7 @@
9
9
  <h3><%= _("Deployment Roles & Available Services") %></h3>
10
10
  <h4><%= "#{@deployment.layout.name} - #{@deployment.layout.networking.capitalize} " + _("Networking") %></h4>
11
11
 
12
- <%= render partial: @deployment.networking +
13
- (@deployment.ha? ? "_ha" : "_non_ha")%>
12
+ <%= render partial: @deployment.networking + "_ha"%>
14
13
 
15
14
  <%= render :partial => "wizard_form_buttons",
16
15
  :locals => { :deployment => @deployment,
@@ -1,3 +1,3 @@
1
1
  module Staypuft
2
- VERSION = '0.5.0'
2
+ VERSION = '0.5.1'
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.5.0
4
+ version: 0.5.1
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-11-18 00:00:00.000000000 Z
11
+ date: 2014-11-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: foreman-tasks
@@ -176,7 +176,6 @@ files:
176
176
  - app/models/staypuft/role_class.rb
177
177
  - app/models/staypuft/role_service.rb
178
178
  - app/models/staypuft/service.rb
179
- - app/models/staypuft/service/ui_params.rb
180
179
  - app/models/staypuft/service_class.rb
181
180
  - app/models/staypuft/simple_subnet.rb
182
181
  - app/models/staypuft/subnet_type.rb
@@ -222,6 +221,7 @@ files:
222
221
  - app/views/staypuft/deployments/show.html.erb
223
222
  - app/views/staypuft/interface_assignments/_interfaces.html.erb
224
223
  - app/views/staypuft/interface_assignments/_nics_assignment.html.erb
224
+ - app/views/staypuft/interface_assignments/_nics_assignment_overview.html.erb
225
225
  - app/views/staypuft/interface_assignments/create.js.erb
226
226
  - app/views/staypuft/interface_assignments/destroy.js.erb
227
227
  - app/views/staypuft/interface_assignments/index.html.erb
@@ -234,10 +234,8 @@ files:
234
234
  - app/views/staypuft/steps/_neutron.html.erb
235
235
  - app/views/staypuft/steps/_neutron_cisco_nexus_form.html.erb
236
236
  - app/views/staypuft/steps/_neutron_ha.html.erb
237
- - app/views/staypuft/steps/_neutron_non_ha.html.erb
238
237
  - app/views/staypuft/steps/_nova.html.erb
239
238
  - app/views/staypuft/steps/_nova_ha.html.erb
240
- - app/views/staypuft/steps/_nova_non_ha.html.erb
241
239
  - app/views/staypuft/steps/_title.html.erb
242
240
  - app/views/staypuft/steps/_wizard_form_buttons.html.erb
243
241
  - app/views/staypuft/steps/deployment_settings.html.erb
@@ -317,9 +315,9 @@ signing_key:
317
315
  specification_version: 4
318
316
  summary: OpenStack Foreman Installer
319
317
  test_files:
318
+ - test/unit/staypuft_test.rb
320
319
  - test/test_helper.rb
321
320
  - test/staypuft_test.rb
322
- - test/unit/staypuft_test.rb
321
+ - test/integration/navigation_test.rb
323
322
  - test/test_plugin_helper.rb
324
323
  - test/factories/staypuft_factories.rb
325
- - test/integration/navigation_test.rb
@@ -1,128 +0,0 @@
1
- # for each service, a list of param names. Optionally, instead of a string
2
- # for a param name, an array of [param_name, puppetclass] in the case where
3
- # there are possibly multiple puppetclass matches. without this, we'll
4
- # just grab the first puppetclass from the matching hostgroup
5
-
6
- Staypuft::Service::UI_PARAMS = {
7
- 'AMQP (non-HA)' => ['amqp_server',
8
- 'amqp_host',
9
- 'amqp_username',
10
- 'amqp_password',
11
- 'amqp_ca',
12
- 'amqp_cert',
13
- 'amqp_key',
14
- 'amqp_nssdb_password'],
15
- 'MySQL' => ['mysql_ca',
16
- 'mysql_cert',
17
- 'mysql_host',
18
- 'mysql_key',
19
- 'mysql_root_password'],
20
- 'Keystone (non-HA)' => ['keystone_admin_token',
21
- 'keystone_db_password',
22
- 'keystonerc'],
23
- 'Nova (Controller)' => ['admin_email',
24
- 'admin_password',
25
- 'auto_assign_floating_ip',
26
- 'controller_admin_host',
27
- 'controller_priv_host',
28
- 'controller_pub_host',
29
- 'freeipa',
30
- 'horizon_ca',
31
- 'horizon_cert',
32
- 'horizon_key',
33
- 'horizon_secret_key',
34
- 'nova_db_password',
35
- 'nova_user_password',
36
- 'nova_default_floating_pool',
37
- 'ssl',
38
- 'verbose',
39
- 'swift_admin_password',
40
- 'swift_ringserver_ip',
41
- 'swift_shared_secret',
42
- 'swift_storage_device',
43
- 'swift_storage_ips'],
44
- 'Neutron (Controller)' => ['admin_email',
45
- 'admin_password',
46
- 'controller_admin_host',
47
- 'controller_priv_host',
48
- 'controller_pub_host',
49
- 'enable_tunneling',
50
- 'freeipa',
51
- 'horizon_ca',
52
- 'horizon_cert',
53
- 'horizon_key',
54
- 'horizon_secret_key',
55
- 'ml2_firewall_driver',
56
- 'ml2_flat_networks',
57
- 'ml2_install_deps',
58
- 'ml2_mechanism_drivers',
59
- 'ml2_network_vlan_ranges',
60
- 'ml2_security_group',
61
- 'ml2_tenant_network_types',
62
- 'ml2_tunnel_id_ranges',
63
- 'ml2_type_drivers',
64
- 'ml2_vni_ranges',
65
- 'ml2_vxlan_group',
66
- 'neutron_core_plugin',
67
- 'neutron_db_password',
68
- 'neutron_metadata_proxy_secret',
69
- 'neutron_user_password',
70
- 'nova_db_password',
71
- 'nova_user_password',
72
- 'nova_default_floating_pool',
73
- 'ovs_vlan_ranges',
74
- 'provider_vlan_auto_create',
75
- 'provider_vlan_auto_trunk',
76
- 'ssl',
77
- 'tenant_network_type',
78
- 'tunnel_id_ranges',
79
- 'verbose',
80
- 'swift_admin_password',
81
- 'swift_ringserver_ip',
82
- 'swift_shared_secret',
83
- 'swift_storage_device',
84
- 'swift_storage_ips'],
85
- 'Glance (non-HA)' => ['glance_db_password',
86
- 'glance_user_password',
87
- 'glance_backend',
88
- 'glance_rbd_store_user',
89
- 'glance_rbd_store_pool'],
90
- 'Cinder (controller)' => ['cinder_backend_eqlx',
91
- 'cinder_backend_eqlx_name',
92
- 'cinder_backend_gluster',
93
- 'cinder_backend_gluster_name',
94
- 'cinder_backend_iscsi',
95
- 'cinder_backend_iscsi_name',
96
- 'cinder_backend_nfs',
97
- 'cinder_backend_nfs_name',
98
- 'cinder_backend_rbd',
99
- 'cinder_backend_rbd_name',
100
- 'cinder_db_password',
101
- 'cinder_multiple_backends',
102
- 'cinder_gluster_shares',
103
- 'cinder_nfs_shares',
104
- 'cinder_nfs_mount_options',
105
- 'cinder_san_ip',
106
- 'cinder_san_login',
107
- 'cinder_san_password',
108
- 'cinder_san_thin_provision',
109
- 'cinder_eqlx_group_name',
110
- 'cinder_eqlx_pool',
111
- 'cinder_eqlx_use_chap',
112
- 'cinder_eqlx_chap_login',
113
- 'cinder_eqlx_chap_password',
114
- 'cinder_rbd_pool',
115
- 'cinder_rbd_ceph_conf',
116
- 'cinder_rbd_flatten_volume_from_snapshot',
117
- 'cinder_rbd_max_clone_depth',
118
- 'cinder_rbd_user',
119
- 'cinder_rbd_secret_uuid',
120
- 'cinder_user_password'],
121
- 'Heat' => ['heat_cfn',
122
- 'heat_cloudwatch',
123
- 'heat_db_password',
124
- 'heat_user_password',
125
- 'heat_auth_encrypt_key'],
126
- 'Ceilometer' => ['ceilometer_metering_secret',
127
- 'ceilometer_user_password'] }
128
-
@@ -1,41 +0,0 @@
1
- <!--Neutron Non-HA-->
2
- <div class="clearfix">
3
- <div class="panel panel-default service-box">
4
- <div class="panel-heading"><strong><%= _("Controller") %></strong></div>
5
- <div class="panel-body">
6
- <ul>
7
- <li>Horizon</li>
8
- <li>Keystone</li>
9
- <li>Glance</li>
10
- <li>Cinder</li>
11
- <li>Nova</li>
12
- <li>Neutron Server</li>
13
- <li>Database</li>
14
- <li>Messaging</li>
15
- <li>Heat</li>
16
- <li>Ceilometer</li>
17
- </ul>
18
- </div>
19
- </div>
20
- <div class="panel panel-default service-box">
21
- <div class="panel-heading"><strong><%= _("Compute") %></strong></div>
22
- <div class="panel-body">
23
- <ul>
24
- <li>Nova-Compute</li>
25
- <li>Open vSwitch Agent</li>
26
- <li>Ceilometer Agent</li>
27
- </ul>
28
- </div>
29
- </div>
30
- <div class="panel panel-default service-box">
31
- <div class="panel-heading"><strong><%= _("Neutron Network Node") %></strong></div>
32
- <div class="panel-body">
33
- <ul>
34
- <li>L3 Agent</li>
35
- <li>Open vSwitch Agent</li>
36
- <li>DHCP Agent</li>
37
- <li>Metadata Agent</li>
38
- </ul>
39
- </div>
40
- </div>
41
- </div>
@@ -1,29 +0,0 @@
1
- <!--Nova-Network Non-HA-->
2
- <div class="clearfix">
3
- <div class="panel panel-default service-box">
4
- <div class="panel-heading"><strong><%= _("Controller") %></strong></div>
5
- <div class="panel-body">
6
- <ul>
7
- <li>Horizon</li>
8
- <li>Keystone</li>
9
- <li>Glance</li>
10
- <li>Cinder</li>
11
- <li>Nova</li>
12
- <li>Database</li>
13
- <li>Messaging</li>
14
- <li>Heat</li>
15
- <li>Ceilometer</li>
16
- </ul>
17
- </div>
18
- </div>
19
- <div class="panel panel-default service-box">
20
- <div class="panel-heading"><strong><%= _("Compute") %></strong></div>
21
- <div class="panel-body">
22
- <ul>
23
- <li>Nova Compute</li>
24
- <li>Nova Network</li>
25
- <li>Ceilometer Agent</li>
26
- </ul>
27
- </div>
28
- </div>
29
- </div>