staypuft 0.5.25 → 0.5.26

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: ffd1b0e75ea93be655e5a9ed78dc1d92835a2558
4
- data.tar.gz: 3e1a331af324795f224fc3f9d8508b02eb37e9e9
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ MDZlYzg4MDFlZmE1ZjczZjg4YTBiNDFjMDgwNTQzMGIzM2VlZTlhZQ==
5
+ data.tar.gz: !binary |-
6
+ YWJjM2YxNDU0OGVkZGQzMzZjNmZkN2U2ZDQxMzkwNWI0MWY1ZWU2Ng==
5
7
  SHA512:
6
- metadata.gz: 924657d23f3137033ad7e9786a3c701cf4a78cc0e6e704d2918ff9efa4033ab1a6d6a356ba896bf5168eb1afdba9d9461a450c5e2d4e3d429b5e46b78312f396
7
- data.tar.gz: ccc4eab8e7d0a9225bc4bb69c30097f58608cb4af21494e39aa69ac4d65e10f4c4297aed9dcb1fc3e45a9c8ad6f4eb0d129da0da2b726f47070621d445b319c2
8
+ metadata.gz: !binary |-
9
+ M2M5YzczNjA2NThmMWRmODY2NTRjM2VkODFjNjZlNTYwNmMzYzY1MzZkMWM5
10
+ ZTQ3OGQ0OTUyNmM0MGJkMTkzNjQ2MjkxNmEwNWQ4OWZhMGRkMmI3OGI2Y2I1
11
+ ZDhkODdhZDFlOGQzYjk1Yjk0ZWFmYmRkOWIxYTMwMThmNThiNTU=
12
+ data.tar.gz: !binary |-
13
+ ZWM4MzA4YzQ1OTJjOTM4ZDUwMTk5ZmIyNzU1NGE4N2ZlMzI5YjQzODMyNzU0
14
+ NjlhYWRiNjhjYzY4YzgxY2VjNjdlNTA3ZDBiMmI5MjQ2MzYxZWQ0ODgxM2Vl
15
+ M2E4YTliZTU3MWE5ZDEzZjFkNjA5NmU3YmVjM2RlMWY0NTZlNDU=
@@ -302,6 +302,18 @@ $('.neutron_ml2_mechanisms').parent().parent().removeClass('col-md-6').addClass(
302
302
  }
303
303
  }
304
304
 
305
+ showNeutronMl2CiscoN1kv();
306
+ $("#staypuft_deployment_neutron_ml2_cisco_n1kv").change(showNeutronMl2CiscoN1kv);
307
+ function showNeutronMl2CiscoN1kv() {
308
+ if ($('#staypuft_deployment_neutron_ml2_cisco_n1kv').is(":checked")) {
309
+ $('#staypuft_deployment_neutron_ml2_cisco_n1kv').parent().after($('.neutron_cisco_n1kv'));
310
+ $('.neutron_cisco_n1kv').fadeIn(duration);
311
+ }
312
+ else {
313
+ $('.neutron_cisco_n1kv').fadeOut(duration);
314
+ }
315
+ }
316
+
305
317
  showCephNotification();
306
318
  function showCephNotification() {
307
319
  var cephDeploymentNotification = readFromCookie();
@@ -64,15 +64,20 @@ module Staypuft
64
64
  Staypuft::SubnetType::TENANT, host)
65
65
  return [] if interface_hash.empty?
66
66
  subnet = interface_hash[:subnet]
67
- top_level_interface = host.interfaces.where(
68
- identifier: interface_hash[:interface]).first
69
- interfaces = [top_level_interface.identifier]
70
- if subnet && subnet.has_vlanid?
71
- next_interface = host.interfaces.where(identifier:
72
- top_level_interface.attached_to).first
73
- interfaces << next_interface.identifier
74
- if next_interface.is_a? Nic::Bond
75
- interfaces << next_interface.attached_devices_identifiers
67
+ interfaces = []
68
+ if interface_hash[:interface] == host.primary_interface
69
+ interfaces << host.primary_interface
70
+ else
71
+ top_level_interface = host.interfaces.where(
72
+ identifier: interface_hash[:interface]).first
73
+ interfaces << top_level_interface.identifier
74
+ if subnet && subnet.has_vlanid? && top_level_interface
75
+ next_interface = host.interfaces.where(identifier:
76
+ top_level_interface.attached_to).first
77
+ interfaces << next_interface.identifier
78
+ if next_interface.is_a? Nic::Bond
79
+ interfaces << next_interface.attached_devices_identifiers
80
+ end
76
81
  end
77
82
  end
78
83
  interfaces.flatten
@@ -411,8 +411,8 @@ module Staypuft
411
411
  cisco_nexus_config = { :hash => '<%= n = @host.deployment.neutron; (n.active? && n.cisco_nexus_mechanism?) ? n.compute_cisco_nexus_config : {} %>' }
412
412
 
413
413
  # Cisco N1KV params
414
- n1kv_vsm_ip = { :string => '<%= n = @host.deployment.neutron; (n.active? && n.n1kv_plugin?) ? n.n1kv_vsm_ip : "" %>' }
415
- n1kv_vsm_password = { :string => '<%= n = @host.deployment.neutron; (n.active? && n.n1kv_plugin?) ? n.n1kv_vsm_password : "" %>' }
414
+ n1kv_vsm_ip = { :string => '<%= n = @host.deployment.neutron; (n.active? && (n.n1kv_plugin? || n.cisco_n1kv_mechanism?)) ? n.n1kv_vsm_ip : "" %>' }
415
+ n1kv_vsm_password = { :string => '<%= n = @host.deployment.neutron; (n.active? && (n.n1kv_plugin? || n.cisco_n1kv_mechanism?)) ? n.n1kv_vsm_password : "" %>' }
416
416
  n1kv_plugin_additional_params = { :hash => { 'default_policy_profile' => 'default-pp',
417
417
  'network_node_policy_profile' => 'default-pp',
418
418
  'poll_duration' => '10',
@@ -6,7 +6,7 @@ module Staypuft
6
6
 
7
7
  SEGMENTATION_LIST = ['vxlan', 'vlan', 'gre']
8
8
  VLAN_HELP = N_('[1-4094] (e.g. 10:15)')
9
- ML2MECHANISM_TYPES = :ml2_openvswitch, :ml2_l2population, :ml2_cisco_nexus
9
+ ML2MECHANISM_TYPES = :ml2_openvswitch, :ml2_l2population, :ml2_cisco_nexus, :ml2_cisco_n1kv
10
10
  N1KV_PARAMS = :n1kv_vsm_ip, :n1kv_vsm_password
11
11
 
12
12
  param_attr :network_segmentation, :tenant_vlan_ranges, :core_plugin, :network_device_mtu,
@@ -69,9 +69,11 @@ module Staypuft
69
69
  OPENVSWITCH = 'openvswitch'
70
70
  L2POPULATION = 'l2population'
71
71
  CISCO_NEXUS = 'cisco_nexus'
72
+ CISCO_N1KV = 'cisco_n1kv'
72
73
  LABELS = { OPENVSWITCH => N_('Open vSwitch'),
73
74
  L2POPULATION => N_('L2 Population'),
74
- CISCO_NEXUS => N_('Cisco Nexus') }
75
+ CISCO_NEXUS => N_('Cisco Nexus'),
76
+ CISCO_N1KV => N_('Cisco N1KV')}
75
77
  TYPES = LABELS.keys
76
78
  HUMAN = N_('ML2 Mechanism Drivers')
77
79
  end
@@ -100,7 +102,7 @@ module Staypuft
100
102
  allow :networker_vlan_ranges, :compute_vlan_ranges, :network_segmentation, :enable_tunneling?,
101
103
  :tenant_iface, :networker_ovs_bridge_mappings, :networker_ovs_bridge_uplinks,
102
104
  :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks, :ovs_tunnel_types,
103
- :openvswitch_mechanism?, :l2population_mechanism?, :cisco_nexus_mechanism?,
105
+ :openvswitch_mechanism?, :l2population_mechanism?, :cisco_nexus_mechanism?, :cisco_n1kv_mechanism?,
104
106
  :ml2_mechanisms, :nexuses, :active?, :compute_cisco_nexus_config, :core_plugin,
105
107
  :ml2_plugin?, :n1kv_plugin?, :n1kv_vsm_ip, :n1kv_vsm_password,
106
108
  :core_plugin_module, :network_device_mtu, :compute_network_device_mtu, :l3_ha
@@ -112,6 +114,7 @@ module Staypuft
112
114
  self.ml2_openvswitch = "true"
113
115
  self.ml2_l2population = "false"
114
116
  self.ml2_cisco_nexus = "false"
117
+ self.ml2_cisco_n1kv = "false"
115
118
  self.network_device_mtu = nil
116
119
  end
117
120
 
@@ -188,6 +191,10 @@ module Staypuft
188
191
  self.ml2_cisco_nexus == "true"
189
192
  end
190
193
 
194
+ def cisco_n1kv_mechanism?
195
+ self.ml2_cisco_n1kv == "true"
196
+ end
197
+
191
198
  def ml2_plugin?
192
199
  self.core_plugin == CorePlugin::ML2
193
200
  end
@@ -219,6 +226,7 @@ module Staypuft
219
226
  'ml2_openvswitch' => ml2_openvswitch,
220
227
  'ml2_l2population' => ml2_l2population,
221
228
  'ml2_cisco_nexus' => ml2_cisco_nexus,
229
+ 'ml2_cisco_n1kv' => ml2_cisco_n1kv,
222
230
  'nexuses' => nexuses,
223
231
  'n1kv_vsm_ip' => n1kv_vsm_ip,
224
232
  'n1kv_vsm_password' => n1kv_vsm_password }
@@ -48,6 +48,13 @@
48
48
  :checked => @deployment.neutron.cisco_nexus_mechanism?,
49
49
  :text => _(Staypuft::Deployment::NeutronService::Ml2Mechanisms::LABELS['cisco_nexus']))
50
50
  %>
51
+ <%= check_box_f_non_inline(p, :ml2_cisco_n1kv,
52
+ :checked_value => 'true',
53
+ :unchecked_value => 'false',
54
+ :checked => @deployment.neutron.cisco_n1kv_mechanism?,
55
+ :text => _(Staypuft::Deployment::NeutronService::Ml2Mechanisms::LABELS['cisco_n1kv']))
56
+ %>
57
+
51
58
  </div>
52
59
 
53
60
  <div class="neutron_n1kv_parameters inset_form hide">
@@ -69,4 +76,9 @@
69
76
  <button type="button" class= "btn btn-primary btn-sm add_another_switch"><%= _("Add Another Switch") %></button>
70
77
  </div>
71
78
 
79
+ <div class="neutron_cisco_n1kv inset_form hide">
80
+ <%= change_label_width 4, text_f(p, :n1kv_vsm_ip, class: "neutron_n1kv_vsm_ip", label: _('VSM IP')) %>
81
+ <%= change_label_width 4, text_f(p, :n1kv_vsm_password, class: "neutron_n1kv_vsm_password", label: _('VSM Password')) %>
82
+ </div>
83
+
72
84
  <% end %>
@@ -1,3 +1,3 @@
1
1
  module Staypuft
2
- VERSION = '0.5.25'
2
+ VERSION = '0.5.26'
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.25
4
+ version: 0.5.26
5
5
  platform: ruby
6
6
  authors:
7
7
  - Staypuft team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-28 00:00:00.000000000 Z
11
+ date: 2015-08-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: foreman-tasks
@@ -42,56 +42,56 @@ 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
56
56
  name: deface
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ! '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: foreman_discovery
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ! '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ! '>='
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: ipaddress
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '>='
87
+ - - ! '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '>='
94
+ - - ! '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  description: OpenStack Foreman Installer Plugin
@@ -101,202 +101,202 @@ executables: []
101
101
  extensions: []
102
102
  extra_rdoc_files: []
103
103
  files:
104
- - app/assets/javascripts/staypuft/nics_assignment.js
104
+ - LICENSE
105
+ - README.md
106
+ - Rakefile
105
107
  - app/assets/javascripts/staypuft/host_edit.js
106
108
  - app/assets/javascripts/staypuft/new_subnet.js
109
+ - app/assets/javascripts/staypuft/nics_assignment.js
107
110
  - app/assets/javascripts/staypuft/staypuft.js
108
111
  - app/assets/javascripts/staypuft/subnets_assignment.js
109
112
  - app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss
110
113
  - app/assets/stylesheets/staypuft/foreman_helper.scss
111
114
  - app/assets/stylesheets/staypuft/staypuft.css.scss
112
115
  - app/controllers/staypuft/application_controller.rb
113
- - app/controllers/staypuft/subnet_typings_controller.rb
114
- - app/controllers/staypuft/interface_assignments_controller.rb
115
- - app/controllers/staypuft/steps_controller.rb
116
+ - app/controllers/staypuft/bonds_controller.rb
116
117
  - app/controllers/staypuft/concerns/hosts_api_extensions.rb
117
118
  - app/controllers/staypuft/concerns/hosts_controller_extensions.rb
118
119
  - app/controllers/staypuft/deployments_controller.rb
120
+ - app/controllers/staypuft/interface_assignments_controller.rb
121
+ - app/controllers/staypuft/steps_controller.rb
122
+ - app/controllers/staypuft/subnet_typings_controller.rb
119
123
  - app/controllers/staypuft/subnets_controller.rb
120
- - app/controllers/staypuft/bonds_controller.rb
121
- - app/models/staypuft/fencing.rb
122
- - app/models/staypuft/simple_subnet.rb
123
- - app/models/staypuft/layout_role.rb
124
- - app/models/staypuft/interface_assigner.rb
125
- - app/models/staypuft/role.rb
126
- - app/models/staypuft/deployment/vlan_range_values_validator.rb
124
+ - app/helpers/staypuft/application_helper.rb
125
+ - app/helpers/staypuft/deployments_helper.rb
126
+ - app/helpers/staypuft/hosts_helper.rb
127
+ - app/lib/actions/staypuft/deployment/deploy.rb
128
+ - app/lib/actions/staypuft/deployment/populate.rb
129
+ - app/lib/actions/staypuft/host/assert_report_success.rb
130
+ - app/lib/actions/staypuft/host/create.rb
131
+ - app/lib/actions/staypuft/host/deploy.rb
132
+ - app/lib/actions/staypuft/host/puppet_run.rb
133
+ - app/lib/actions/staypuft/host/report_wait.rb
134
+ - app/lib/actions/staypuft/host/trigger_provisioning.rb
135
+ - app/lib/actions/staypuft/host/update.rb
136
+ - app/lib/actions/staypuft/host/wait_until_provisioned.rb
137
+ - app/lib/actions/staypuft/host/wait_until_ready.rb
138
+ - app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
139
+ - app/lib/actions/staypuft/middleware/as_current_user.rb
140
+ - app/lib/actions/staypuft/middleware/timeout.rb
141
+ - app/lib/staypuft/deployment_param_exporter.rb
142
+ - app/lib/staypuft/deployment_param_importer.rb
143
+ - app/lib/staypuft/exception.rb
144
+ - app/lib/staypuft/network_query.rb
145
+ - app/lib/staypuft/seeder.rb
146
+ - app/models/setting/staypuft_provisioning.rb
147
+ - app/models/staypuft/concerns/environment_extensions.rb
148
+ - app/models/staypuft/concerns/host_details_helper.rb
149
+ - app/models/staypuft/concerns/host_fencing_extensions.rb
150
+ - app/models/staypuft/concerns/host_interface_management.rb
151
+ - app/models/staypuft/concerns/host_open_stack_affiliation.rb
152
+ - app/models/staypuft/concerns/host_orchestration_build_hook.rb
153
+ - app/models/staypuft/concerns/hostgroup_extensions.rb
154
+ - app/models/staypuft/concerns/lookup_key_extensions.rb
155
+ - app/models/staypuft/concerns/nic_bonding_extensions.rb
156
+ - app/models/staypuft/concerns/nic_fencing_extensions.rb
157
+ - app/models/staypuft/concerns/puppetclass_extensions.rb
158
+ - app/models/staypuft/deployment.rb
159
+ - app/models/staypuft/deployment/abstract_param_scope.rb
160
+ - app/models/staypuft/deployment/attribute_param_storage.rb
127
161
  - app/models/staypuft/deployment/ceph_service.rb
128
- - app/models/staypuft/deployment/nova_service.rb
129
162
  - app/models/staypuft/deployment/cinder_service.rb
130
- - app/models/staypuft/deployment/nfs_uri_validator.rb
131
- - app/models/staypuft/deployment/abstract_param_scope.rb
132
- - app/models/staypuft/deployment/neutron_service/cisconexus.rb
133
163
  - app/models/staypuft/deployment/cinder_service/equallogic.rb
134
164
  - app/models/staypuft/deployment/cinder_service/netapp.rb
135
- - app/models/staypuft/deployment/neutron_service.rb
136
- - app/models/staypuft/deployment/ip_check.rb
137
165
  - app/models/staypuft/deployment/glance_service.rb
138
- - app/models/staypuft/deployment/attribute_param_storage.rb
139
166
  - app/models/staypuft/deployment/ip_address_validator.rb
167
+ - app/models/staypuft/deployment/ip_check.rb
168
+ - app/models/staypuft/deployment/neutron_service.rb
169
+ - app/models/staypuft/deployment/neutron_service/cisconexus.rb
170
+ - app/models/staypuft/deployment/nfs_uri_validator.rb
171
+ - app/models/staypuft/deployment/nova_service.rb
140
172
  - app/models/staypuft/deployment/passwords.rb
173
+ - app/models/staypuft/deployment/vlan_range_values_validator.rb
174
+ - app/models/staypuft/deployment_role_hostgroup.rb
141
175
  - app/models/staypuft/deployment_vip_nic.rb
142
- - app/models/staypuft/service_class.rb
143
- - app/models/staypuft/subnet_type.rb
176
+ - app/models/staypuft/fencing.rb
177
+ - app/models/staypuft/interface_assigner.rb
144
178
  - app/models/staypuft/layout.rb
145
- - app/models/staypuft/concerns/hostgroup_extensions.rb
146
- - app/models/staypuft/concerns/puppetclass_extensions.rb
147
- - app/models/staypuft/concerns/nic_fencing_extensions.rb
148
- - app/models/staypuft/concerns/host_details_helper.rb
149
- - app/models/staypuft/concerns/environment_extensions.rb
150
- - app/models/staypuft/concerns/host_interface_management.rb
151
- - app/models/staypuft/concerns/host_orchestration_build_hook.rb
152
- - app/models/staypuft/concerns/host_fencing_extensions.rb
153
- - app/models/staypuft/concerns/lookup_key_extensions.rb
154
- - app/models/staypuft/concerns/nic_bonding_extensions.rb
155
- - app/models/staypuft/concerns/host_open_stack_affiliation.rb
179
+ - app/models/staypuft/layout_role.rb
180
+ - app/models/staypuft/layout_subnet_type.rb
181
+ - app/models/staypuft/role.rb
182
+ - app/models/staypuft/role_class.rb
156
183
  - app/models/staypuft/role_service.rb
157
184
  - app/models/staypuft/service.rb
158
- - app/models/staypuft/role_class.rb
159
- - app/models/staypuft/layout_subnet_type.rb
160
- - app/models/staypuft/vip_nic.rb
161
- - app/models/staypuft/deployment.rb
185
+ - app/models/staypuft/service_class.rb
186
+ - app/models/staypuft/simple_subnet.rb
187
+ - app/models/staypuft/subnet_type.rb
162
188
  - app/models/staypuft/subnet_typing.rb
163
- - app/models/staypuft/deployment_role_hostgroup.rb
164
- - app/models/setting/staypuft_provisioning.rb
189
+ - app/models/staypuft/vip_nic.rb
165
190
  - app/overrides/customize_foreman_tasks_show_page.rb
166
- - app/overrides/select_multiple_systems_hostgroup.rb
167
191
  - app/overrides/foreman_hosts_edit.rb
168
- - app/overrides/hosts_edit_subnet_types.rb
169
192
  - app/overrides/hide_subscription_manager_passwords.rb
170
- - app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
171
- - app/lib/actions/staypuft/deployment/populate.rb
172
- - app/lib/actions/staypuft/deployment/deploy.rb
173
- - app/lib/actions/staypuft/host/assert_report_success.rb
174
- - app/lib/actions/staypuft/host/update.rb
175
- - app/lib/actions/staypuft/host/wait_until_ready.rb
176
- - app/lib/actions/staypuft/host/puppet_run.rb
177
- - app/lib/actions/staypuft/host/trigger_provisioning.rb
178
- - app/lib/actions/staypuft/host/report_wait.rb
179
- - app/lib/actions/staypuft/host/wait_until_provisioned.rb
180
- - app/lib/actions/staypuft/host/deploy.rb
181
- - app/lib/actions/staypuft/host/create.rb
182
- - app/lib/actions/staypuft/middleware/as_current_user.rb
183
- - app/lib/actions/staypuft/middleware/timeout.rb
184
- - app/lib/staypuft/network_query.rb
185
- - app/lib/staypuft/deployment_param_importer.rb
186
- - app/lib/staypuft/seeder.rb
187
- - app/lib/staypuft/exception.rb
188
- - app/lib/staypuft/deployment_param_exporter.rb
189
- - app/views/hosts/_new_nic_fields.html.erb
193
+ - app/overrides/hosts_edit_subnet_types.rb
194
+ - app/overrides/select_multiple_systems_hostgroup.rb
190
195
  - app/views/hosts/_fencing.html.erb
196
+ - app/views/hosts/_new_nic_fields.html.erb
191
197
  - app/views/hosts/_primary_interface_subnet.html.erb
192
- - app/views/staypuft/steps/_nova.html.erb
193
- - app/views/staypuft/steps/services_overview.html.erb
194
- - app/views/staypuft/steps/_neutron_cisco_nexus_form.html.erb
195
- - app/views/staypuft/steps/network_configuration.html.erb
196
- - app/views/staypuft/steps/_cinder_equallogic_form.html.erb
197
- - app/views/staypuft/steps/_title.html.erb
198
- - app/views/staypuft/steps/services_configuration.html.erb
199
- - app/views/staypuft/steps/_neutron_ha.html.erb
200
- - app/views/staypuft/steps/deployment_settings.html.erb
201
- - app/views/staypuft/steps/_cinder.html.erb
202
- - app/views/staypuft/steps/_nova_ha.html.erb
203
- - app/views/staypuft/steps/_glance.html.erb
204
- - app/views/staypuft/steps/_neutron.html.erb
205
- - app/views/staypuft/steps/_cinder_netapp_form.html.erb
206
- - app/views/staypuft/steps/_wizard_form_buttons.html.erb
207
- - app/views/staypuft/subnet_types/_subnet_type_pull.html.erb
208
- - app/views/staypuft/layouts/staypuft.html.erb
209
- - app/views/staypuft/layouts/application.html.erb
210
- - app/views/staypuft/bonds/destroy.js.erb
198
+ - app/views/nic/_subnet_id_field.html.erb
211
199
  - app/views/staypuft/bonds/add_slave.js.erb
212
200
  - app/views/staypuft/bonds/create.js.erb
213
- - app/views/staypuft/subnet_typings/destroy.js.erb
214
- - app/views/staypuft/subnet_typings/create.js.erb
215
- - app/views/staypuft/subnet_typings/update.js.erb
216
- - app/views/staypuft/subnets/new.html.erb
217
- - app/views/staypuft/subnets/create.js.erb
218
- - app/views/staypuft/subnets/_subnet_pull.html.erb
219
- - app/views/staypuft/subnets/_form.html.erb
220
- - app/views/staypuft/subnets/_drop_zone.html.erb
221
- - app/views/staypuft/interfaces/_drop_zone.html.erb
222
- - app/views/staypuft/interface_assignments/index.html.erb
223
- - app/views/staypuft/interface_assignments/destroy.js.erb
224
- - app/views/staypuft/interface_assignments/_interfaces.html.erb
225
- - app/views/staypuft/interface_assignments/create.js.erb
226
- - app/views/staypuft/interface_assignments/_nics_assignment.html.erb
227
- - app/views/staypuft/interface_assignments/_nics_assignment_overview.html.erb
228
- - app/views/staypuft/deployments/edit.html.erb
201
+ - app/views/staypuft/bonds/destroy.js.erb
229
202
  - app/views/staypuft/deployments/_advanced_configuration.html.erb
203
+ - app/views/staypuft/deployments/_assigned_hosts.html.erb
230
204
  - app/views/staypuft/deployments/_assigned_hosts_table.html.erb
231
- - app/views/staypuft/deployments/index.html.erb
205
+ - app/views/staypuft/deployments/_deployed_hosts.html.erb
206
+ - app/views/staypuft/deployments/_deployed_hosts_table.html.erb
207
+ - app/views/staypuft/deployments/_deployment_access_all_details_dialogue.html.erb
208
+ - app/views/staypuft/deployments/_deployment_hosts.html.erb
209
+ - app/views/staypuft/deployments/_deployment_networking.html.erb
232
210
  - app/views/staypuft/deployments/_deployment_overview.html.erb
233
- - app/views/staypuft/deployments/_param_field.html.erb
234
- - app/views/staypuft/deployments/_host_head_row.html.erb
211
+ - app/views/staypuft/deployments/_deployment_progress_bar.html.erb
235
212
  - app/views/staypuft/deployments/_deployment_progress_page_header.html.erb
236
- - app/views/staypuft/deployments/_free_hosts_table.html.erb
237
- - app/views/staypuft/deployments/_hosts_filter.html.erb
213
+ - app/views/staypuft/deployments/_deployment_show_header.html.erb
214
+ - app/views/staypuft/deployments/_deployment_summary.html.erb
238
215
  - app/views/staypuft/deployments/_empty_hosts.html.erb
239
- - app/views/staypuft/deployments/_assigned_hosts.html.erb
240
- - app/views/staypuft/deployments/_host_row.html.erb
241
- - app/views/staypuft/deployments/_deployment_hosts.html.erb
242
- - app/views/staypuft/deployments/show.html.erb
243
- - app/views/staypuft/deployments/_deployed_hosts_table.html.erb
244
- - app/views/staypuft/deployments/_deployed_hosts.html.erb
245
216
  - app/views/staypuft/deployments/_free_hosts.html.erb
246
- - app/views/staypuft/deployments/_hosts_table.html.erb
247
- - app/views/staypuft/deployments/_deployment_show_header.html.erb
217
+ - app/views/staypuft/deployments/_free_hosts_table.html.erb
218
+ - app/views/staypuft/deployments/_host_head_row.html.erb
219
+ - app/views/staypuft/deployments/_host_row.html.erb
220
+ - app/views/staypuft/deployments/_hosts_filter.html.erb
248
221
  - app/views/staypuft/deployments/_hosts_header.html.erb
249
- - app/views/staypuft/deployments/_deployment_access_all_details_dialogue.html.erb
250
- - app/views/staypuft/deployments/_deployment_progress_bar.html.erb
222
+ - app/views/staypuft/deployments/_hosts_table.html.erb
251
223
  - app/views/staypuft/deployments/_import_form.html.erb
252
- - app/views/staypuft/deployments/_deployment_summary.html.erb
253
- - app/views/staypuft/deployments/_deployment_networking.html.erb
254
- - app/views/nic/_subnet_id_field.html.erb
255
- - app/helpers/staypuft/hosts_helper.rb
256
- - app/helpers/staypuft/deployments_helper.rb
257
- - app/helpers/staypuft/application_helper.rb
258
- - config/staypuft.local.rb
224
+ - app/views/staypuft/deployments/_param_field.html.erb
225
+ - app/views/staypuft/deployments/edit.html.erb
226
+ - app/views/staypuft/deployments/index.html.erb
227
+ - app/views/staypuft/deployments/show.html.erb
228
+ - app/views/staypuft/interface_assignments/_interfaces.html.erb
229
+ - app/views/staypuft/interface_assignments/_nics_assignment.html.erb
230
+ - app/views/staypuft/interface_assignments/_nics_assignment_overview.html.erb
231
+ - app/views/staypuft/interface_assignments/create.js.erb
232
+ - app/views/staypuft/interface_assignments/destroy.js.erb
233
+ - app/views/staypuft/interface_assignments/index.html.erb
234
+ - app/views/staypuft/interfaces/_drop_zone.html.erb
235
+ - app/views/staypuft/layouts/application.html.erb
236
+ - app/views/staypuft/layouts/staypuft.html.erb
237
+ - app/views/staypuft/steps/_cinder.html.erb
238
+ - app/views/staypuft/steps/_cinder_equallogic_form.html.erb
239
+ - app/views/staypuft/steps/_cinder_netapp_form.html.erb
240
+ - app/views/staypuft/steps/_glance.html.erb
241
+ - app/views/staypuft/steps/_neutron.html.erb
242
+ - app/views/staypuft/steps/_neutron_cisco_nexus_form.html.erb
243
+ - app/views/staypuft/steps/_neutron_ha.html.erb
244
+ - app/views/staypuft/steps/_nova.html.erb
245
+ - app/views/staypuft/steps/_nova_ha.html.erb
246
+ - app/views/staypuft/steps/_title.html.erb
247
+ - app/views/staypuft/steps/_wizard_form_buttons.html.erb
248
+ - app/views/staypuft/steps/deployment_settings.html.erb
249
+ - app/views/staypuft/steps/network_configuration.html.erb
250
+ - app/views/staypuft/steps/services_configuration.html.erb
251
+ - app/views/staypuft/steps/services_overview.html.erb
252
+ - app/views/staypuft/subnet_types/_subnet_type_pull.html.erb
253
+ - app/views/staypuft/subnet_typings/create.js.erb
254
+ - app/views/staypuft/subnet_typings/destroy.js.erb
255
+ - app/views/staypuft/subnet_typings/update.js.erb
256
+ - app/views/staypuft/subnets/_drop_zone.html.erb
257
+ - app/views/staypuft/subnets/_form.html.erb
258
+ - app/views/staypuft/subnets/_subnet_pull.html.erb
259
+ - app/views/staypuft/subnets/create.js.erb
260
+ - app/views/staypuft/subnets/new.html.erb
259
261
  - config/routes.rb
260
- - db/seeds.rb
261
- - db/migrate/20140701075033_create_layout_subnet.rb
262
- - db/migrate/20140310023613_create_staypuft_roles.rb
263
- - db/migrate/20140310203855_create_staypuft_role_services.rb
264
- - db/migrate/20140701090256_create_staypuft_subnet_typings.rb
265
- - db/migrate/20140701074900_create_subnet_type.rb
266
- - db/migrate/20140602121501_add_amqp_provider_to_staypuft_deployment.rb
262
+ - config/staypuft.local.rb
267
263
  - db/migrate/20140309021811_create_staypuft_layouts.rb
264
+ - db/migrate/20140310004533_create_staypuft_deployments.rb
265
+ - db/migrate/20140310023613_create_staypuft_roles.rb
268
266
  - db/migrate/20140310174152_create_staypuft_layout_roles.rb
267
+ - db/migrate/20140310194221_create_staypuft_services.rb
268
+ - db/migrate/20140310203855_create_staypuft_role_services.rb
269
+ - db/migrate/20140312044533_create_staypuft_deployment_role_hostgroups.rb
270
+ - db/migrate/20140312050001_create_staypuft_hostgroup_roles.rb
271
+ - db/migrate/20140312050615_create_staypuft_role_classes.rb
272
+ - db/migrate/20140312051144_create_staypuft_service_classes.rb
273
+ - db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
269
274
  - db/migrate/20140318163222_add_deploy_order_to_staypuft_layout_role.rb
270
- - db/migrate/20140825164900_add_orchestration_to_staypuft_role.rb
275
+ - db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
271
276
  - db/migrate/20140326032027_drop_staypuft_hostgroup_roles.rb
272
- - db/migrate/20140623142500_remove_amqp_provider_from_staypuft_deployment.rb
273
- - db/migrate/20141009064907_add_custom_repos_to_deployment.rb
277
+ - db/migrate/20140507103716_add_form_step_to_staypuft_deployment.rb
274
278
  - db/migrate/20140513124807_change_column_default_form_step_on_staypuft_deployment.rb
275
- - db/migrate/20140312050615_create_staypuft_role_classes.rb
276
- - db/migrate/20140310004533_create_staypuft_deployments.rb
277
- - db/migrate/20140312050001_create_staypuft_hostgroup_roles.rb
279
+ - db/migrate/20140602121501_add_amqp_provider_to_staypuft_deployment.rb
280
+ - db/migrate/20140623142500_remove_amqp_provider_from_staypuft_deployment.rb
281
+ - db/migrate/20140701074900_create_subnet_type.rb
282
+ - db/migrate/20140701075033_create_layout_subnet.rb
283
+ - db/migrate/20140701090256_create_staypuft_subnet_typings.rb
284
+ - db/migrate/20140825164900_add_orchestration_to_staypuft_role.rb
278
285
  - db/migrate/20140831234000_add_required_to_subnet_types.rb
279
- - db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
280
- - db/migrate/20140312051144_create_staypuft_service_classes.rb
281
286
  - db/migrate/20141003223000_add_validation_to_subnet_types.rb
282
- - db/migrate/20140312044533_create_staypuft_deployment_role_hostgroups.rb
283
- - db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
284
- - db/migrate/20140507103716_add_form_step_to_staypuft_deployment.rb
287
+ - db/migrate/20141009064907_add_custom_repos_to_deployment.rb
285
288
  - db/migrate/20141107144800_create_staypuft_deployment_vip_nics.rb
286
- - db/migrate/20140310194221_create_staypuft_services.rb
289
+ - db/seeds.rb
287
290
  - lib/staypuft.rb
288
291
  - lib/staypuft/engine.rb
289
292
  - lib/staypuft/version.rb
290
293
  - lib/tasks/staypuft_tasks.rake
291
- - LICENSE
292
- - Rakefile
293
- - README.md
294
- - test/test_helper.rb
295
- - test/staypuft_test.rb
296
- - test/unit/staypuft_test.rb
297
- - test/test_plugin_helper.rb
298
294
  - test/factories/staypuft_factories.rb
299
295
  - test/integration/navigation_test.rb
296
+ - test/staypuft_test.rb
297
+ - test/test_helper.rb
298
+ - test/test_plugin_helper.rb
299
+ - test/unit/staypuft_test.rb
300
300
  homepage: https://github.com/theforeman/staypuft
301
301
  licenses:
302
302
  - GPL-3.0+
@@ -307,24 +307,24 @@ require_paths:
307
307
  - lib
308
308
  required_ruby_version: !ruby/object:Gem::Requirement
309
309
  requirements:
310
- - - '>='
310
+ - - ! '>='
311
311
  - !ruby/object:Gem::Version
312
312
  version: '0'
313
313
  required_rubygems_version: !ruby/object:Gem::Requirement
314
314
  requirements:
315
- - - '>='
315
+ - - ! '>='
316
316
  - !ruby/object:Gem::Version
317
317
  version: '0'
318
318
  requirements: []
319
319
  rubyforge_project:
320
- rubygems_version: 2.0.14
320
+ rubygems_version: 2.2.2
321
321
  signing_key:
322
322
  specification_version: 4
323
323
  summary: OpenStack Foreman Installer
324
324
  test_files:
325
+ - test/unit/staypuft_test.rb
325
326
  - test/test_helper.rb
326
327
  - test/staypuft_test.rb
327
- - test/unit/staypuft_test.rb
328
+ - test/integration/navigation_test.rb
328
329
  - test/test_plugin_helper.rb
329
330
  - test/factories/staypuft_factories.rb
330
- - test/integration/navigation_test.rb