staypuft 0.0.14 → 0.0.15

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/app/models/staypuft/service/ui_params.rb +18 -78
  2. data/db/seeds.rb +10 -12
  3. data/lib/staypuft/version.rb +1 -1
  4. metadata +2 -2
data/app/models/staypuft/service/ui_params.rb CHANGED
@@ -7,6 +7,8 @@ Staypuft::Service::UI_PARAMS = {
7
7
  'qpid (non-HA)' => ['qpid_ca',
8
8
  'qpid_cert',
9
9
  'qpid_host',
10
+ 'qpid_username',
11
+ 'qpid_password',
10
12
  'qpid_key',
11
13
  'qpid_nssdb_password'],
12
14
  'MySQL' => ['mysql_ca',
@@ -15,11 +17,11 @@ Staypuft::Service::UI_PARAMS = {
15
17
  'mysql_key',
16
18
  'mysql_root_password'],
17
19
  'Keystone (non-HA)' => ['keystone_admin_token',
18
- 'keystone_db_password'],
20
+ 'keystone_db_password',
21
+ 'keystonerc'],
19
22
  'Nova (Controller)' => ['admin_email',
20
23
  'admin_password',
21
24
  'auto_assign_floating_ip',
22
- 'controller_admin_host',
23
25
  'controller_priv_host',
24
26
  'controller_pub_host',
25
27
  'freeipa',
@@ -29,7 +31,9 @@ Staypuft::Service::UI_PARAMS = {
29
31
  'horizon_secret_key',
30
32
  'nova_db_password',
31
33
  'nova_user_password',
34
+ 'nova_default_floating_pool',
32
35
  'ssl',
36
+ 'verbose',
33
37
  'swift_admin_password',
34
38
  'swift_ringserver_ip',
35
39
  'swift_shared_secret',
@@ -39,7 +43,6 @@ Staypuft::Service::UI_PARAMS = {
39
43
  'admin_password',
40
44
  'cisco_nexus_plugin',
41
45
  'cisco_vswitch_plugin',
42
- 'controller_admin_host',
43
46
  'controller_priv_host',
44
47
  'controller_pub_host',
45
48
  'enable_tunneling',
@@ -52,6 +55,7 @@ Staypuft::Service::UI_PARAMS = {
52
55
  'ml2_install_deps',
53
56
  'ml2_mechanism_drivers',
54
57
  'ml2_network_vlan_ranges',
58
+ 'ml2_security_group',
55
59
  'ml2_tenant_network_types',
56
60
  'ml2_tunnel_id_ranges',
57
61
  'ml2_type_drivers',
@@ -65,6 +69,7 @@ Staypuft::Service::UI_PARAMS = {
65
69
  'nexus_credentials',
66
70
  'nova_db_password',
67
71
  'nova_user_password',
72
+ 'nova_default_floating_pool',
68
73
  'ovs_vlan_ranges',
69
74
  'provider_vlan_auto_create',
70
75
  'provider_vlan_auto_trunk',
@@ -79,24 +84,18 @@ Staypuft::Service::UI_PARAMS = {
79
84
  'swift_storage_ips'],
80
85
  'Glance (non-HA)' => ['glance_db_password',
81
86
  'glance_user_password'],
82
- 'Cinder (controller)' => cinder_params = ['cinder_backend_gluster',
83
- 'cinder_backend_iscsi',
84
- 'cinder_db_password',
85
- 'cinder_gluster_servers',
86
- 'cinder_gluster_volume',
87
- 'cinder_user_password',
88
- 'controller_priv_host',
89
- 'mysql_host',
90
- 'qpid_host'],
91
- 'Cinder (node)' => cinder_params,
87
+ 'Cinder (controller)' => ['cinder_backend_gluster',
88
+ 'cinder_backend_iscsi',
89
+ 'cinder_db_password',
90
+ 'cinder_gluster_servers',
91
+ 'cinder_gluster_volume',
92
+ 'cinder_user_password'],
92
93
  'Heat' => ['heat_cfn',
93
94
  'heat_cloudwatch',
94
95
  'heat_db_password',
95
96
  'heat_user_password',
96
97
  'heat_auth_encrypt_key'],
97
- 'Ceilometer' => ['ceilometer',
98
- 'ceilometer_host',
99
- 'ceilometer_metering_secret',
98
+ 'Ceilometer' => ['ceilometer_metering_secret',
100
99
  'ceilometer_user_password'
101
100
  ],
102
101
  'Neutron - L3' => ['controller_priv_host',
@@ -111,76 +110,17 @@ Staypuft::Service::UI_PARAMS = {
111
110
  'nova_db_password',
112
111
  'nova_user_password',
113
112
  'qpid_host',
113
+ 'qpid_username',
114
+ 'qpid_password',
114
115
  'ssl',
115
116
  'tenant_network_type',
116
117
  'tunnel_id_ranges',
117
118
  'verbose'],
118
- 'DHCP' => [],
119
119
  'OVS' => ['ovs_bridge_mappings',
120
120
  'ovs_bridge_uplinks',
121
121
  'ovs_tunnel_iface',
122
122
  'ovs_tunnel_network',
123
123
  'ovs_tunnel_types',
124
124
  'ovs_vlan_ranges',
125
- 'ovs_vxlan_udp_port'],
126
- 'Nova-compute' => ['admin_password',
127
- 'auto_assign_floating_ip',
128
- 'ceilometer',
129
- 'ceilometer_host',
130
- 'ceilometer_metering_secret',
131
- 'ceilometer_user_password',
132
- 'cinder_backend_gluster',
133
- 'controller_priv_host',
134
- 'controller_pub_host',
135
- 'fixed_network_range',
136
- 'floating_network_range',
137
- 'mysql_ca',
138
- 'mysql_host',
139
- 'nova_db_password',
140
- 'network_private_iface',
141
- 'network_private_network',
142
- 'network_public_iface',
143
- 'network_public_network',
144
- 'nova_user_password',
145
- 'qpid_host',
146
- 'ssl',
147
- 'verbose',
148
- 'use_qemu_for_poc'],
149
- 'Neutron-compute' => ['admin_password',
150
- 'ceilometer',
151
- 'ceilometer_host',
152
- 'ceilometer_metering_secret',
153
- 'ceilometer_user_password',
154
- 'cinder_backend_gluster',
155
- 'controller_admin_host',
156
- 'controller_priv_host',
157
- 'controller_pub_host',
158
- 'enable_tunneling',
159
- 'mysql_ca',
160
- 'mysql_host',
161
- 'neutron_core_plugin',
162
- 'neutron_db_password',
163
- 'neutron_user_password',
164
- 'nova_db_password',
165
- 'nova_user_password',
166
- 'ovs_bridge_mappings',
167
- 'ovs_tunnel_iface',
168
- 'ovs_tunnel_network',
169
- 'ovs_tunnel_types',
170
- 'ovs_vlan_ranges',
171
- 'ovs_vxlan_udp_port',
172
- 'qpid_host',
173
- 'ssl',
174
- 'tenant_network_type',
175
- 'tunnel_id_ranges',
176
- 'verbose',
177
- 'use_qemu_for_poc'],
178
- 'Neutron-ovs-agent' => [],
179
- 'Swift (node)' => ['swift_all_ips',
180
- 'swift_ext4_device',
181
- 'swift_local_interface',
182
- 'swift_local_network',
183
- 'swift_loopback',
184
- 'swift_ring_server',
185
- 'swift_shared_secret'] }
125
+ 'ovs_vxlan_udp_port'] }
186
126
 
data/db/seeds.rb CHANGED
@@ -144,16 +144,14 @@ services = {
144
144
  :neutron_controller => { :name => 'Neutron (Controller)', :class => [] },
145
145
  :non_ha_glance => { :name => 'Glance (non-HA)', :class => [] },
146
146
  :cinder_controller => { :name => 'Cinder (controller)', :class => [] },
147
- :cinder_node => { :name => 'Cinder (node)', :class => [] },
147
+ :cinder_node => { :name => 'Cinder (node)', :class => ['quickstack::storage_backend::lvm_cinder'] },
148
148
  :heat => { :name => 'Heat', :class => [] },
149
149
  :ceilometer => { :name => 'Ceilometer', :class => [] },
150
150
  :neutron_l3 => { :name => 'Neutron - L3', :class => [] },
151
- :dhcp => { :name => 'DHCP', :class => [] },
152
151
  :ovs => { :name => 'OVS', :class => [] },
153
- :nova_compute => { :name => 'Nova-compute', :class => [] },
154
- :neutron_compute => { :name => 'Neutron-compute', :class => [] },
155
- :neutron_ovs_agent => { :name => 'Neutron-ovs-agent', :class => [] },
156
- :swift => { :name => 'Swift (node)', :class => [] },
152
+ :nova_compute => { :name => 'Nova-compute', :class => ['quickstack::nova_network::compute'] },
153
+ :neutron_compute => { :name => 'Neutron-compute', :class => ['quickstack::neutron::compute'] },
154
+ :swift => { :name => 'Swift (node)', :class => ['quickstack::swift::storage'] },
157
155
  :ha_controller => { :name => 'HA (Controller)',
158
156
  :class => ['quickstack::openstack_common',
159
157
  'quickstack::pacemaker::common',
@@ -212,7 +210,7 @@ roles = [
212
210
  :services => [:non_ha_qpid, :mysql, :non_ha_keystone, :nova_controller, :non_ha_glance,
213
211
  :cinder_controller, :heat, :ceilometer] },
214
212
  { :name => 'Compute (Nova)',
215
- :class => 'quickstack::nova_network::compute',
213
+ :class => [],
216
214
  :layouts => [[:ha_nova, 10], [:non_ha_nova, 10]],
217
215
  :services => [:nova_compute] },
218
216
  { :name => 'Controller (Neutron)',
@@ -221,19 +219,19 @@ roles = [
221
219
  :services => [:non_ha_qpid, :mysql, :non_ha_keystone, :neutron_controller, :non_ha_glance,
222
220
  :cinder_controller, :heat, :ceilometer] },
223
221
  { :name => 'Compute (Neutron)',
224
- :class => 'quickstack::neutron::compute',
222
+ :class => [],
225
223
  :layouts => [[:ha_neutron, 10], [:non_ha_neutron, 10]],
226
- :services => [:neutron_compute, :neutron_ovs_agent] },
224
+ :services => [:neutron_compute] },
227
225
  { :name => 'Neutron Networker',
228
226
  :class => 'quickstack::neutron::networker',
229
227
  :layouts => [[:non_ha_neutron, 3]],
230
- :services => [:neutron_l3, :dhcp, :ovs] },
228
+ :services => [:neutron_l3, :ovs] },
231
229
  { :name => 'LVM Block Storage',
232
- :class => 'quickstack::storage_backend::lvm_cinder',
230
+ :class => [],
233
231
  :layouts => [[:ha_nova, 2], [:ha_neutron, 2], [:non_ha_nova, 2], [:non_ha_neutron, 2]],
234
232
  :services => [:cinder_node] },
235
233
  { :name => 'Swift Storage Node',
236
- :class => 'quickstack::swift::storage',
234
+ :class => [],
237
235
  :layouts => [[:ha_nova, 5], [:ha_neutron, 5], [:non_ha_nova, 5], [:non_ha_neutron, 5]],
238
236
  :services => [:swift] },
239
237
  { :name => 'HA Controller',
data/lib/staypuft/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Staypuft
2
- VERSION = '0.0.14'
2
+ VERSION = '0.0.15'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: staypuft
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.14
4
+ version: 0.0.15
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-05-20 00:00:00.000000000 Z
12
+ date: 2014-05-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: foreman-tasks