Skip to content

Commit

Permalink
Update sahara to 6781e080362fa03a7bde0feaa52e2fc0d10b4c8b
Browse files Browse the repository at this point in the history
6781e080362fa03a7bde0feaa52e2fc0d10b4c8b First round of changes from review.
05af265b15eb3c4e1682ab3fc6dc8b6d750d3e36 Default service_host to 0.0.0.0.
  • Loading branch information
xbezdick committed Feb 27, 2015
1 parent 2a26207 commit ab66863
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ mod 'rsync',
:git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'

mod 'sahara',
:commit => '66301097ee42840831f8c8c7cd0482e3e2325df5',
:commit => '6781e080362fa03a7bde0feaa52e2fc0d10b4c8b',
:git => 'https://github.com/frozencemetery/puppet-sahara.git'

mod 'ssh',
Expand Down
2 changes: 1 addition & 1 deletion sahara/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Setup

**What the sahara module affects:**

* sahara, the hadoop clustering service for Openstack.
* sahara, the data processing service for Openstack.

### Installing sahara

Expand Down
4 changes: 2 additions & 2 deletions sahara/examples/basic.pp
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
os_tenant_name => 'admin',
os_auth_url => 'http://127.0.0.1:5000/v2.0/',
identity_url => 'http://127.0.0.1:35357/',
service_host => '127.0.0.1',
service_host => '0.0.0.0',
service_port => 8386,
use_neutron => true,
use_floating_ips => true,
}

# Finally, make it accessible
Expand Down
14 changes: 10 additions & 4 deletions sahara/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,19 @@
#
# [*service_host*]
# (Optional) Hostname for sahara to listen on
# Defaults to '127.0.0.1'.
# Defaults to '0.0.0.0'.
#
# [*service_port*]
# (Optional) Port for sahara to listen on
# Defaults to 8386.
#
# [*use_neutron*]
# (Optional) Whether to use neutron
# Defaults to true.
# Defaults to 'false'.
#
# [*use_floating_ips*]
# (Optional) Whether to use floating IPs to communicate with instances.
# Defaults to 'true'.
#
# [*database_connection*]
# (Optional) Non-sqllite database for sahara
Expand Down Expand Up @@ -68,9 +72,10 @@
$package_ensure = 'present',
$verbose = false,
$debug = false,
$service_host = '127.0.0.1',
$service_host = '0.0.0.0',
$service_port = 8386,
$use_neutron = true,
$use_neutron = false,
$use_floating_ips = true,
$database_connection = 'mysql://sahara:secrete@localhost:3306/sahara',
$os_username = 'admin',
$os_password = 'secrete',
Expand Down Expand Up @@ -123,6 +128,7 @@

sahara_config {
'DEFAULT/use_neutron': value => $use_neutron;
'DEFAULT/use_floating_ips': value => $use_floating_ips;
'DEFAULT/host': value => $service_host;
'DEFAULT/port': value => $service_port;
'DEFAULT/debug': value => $debug;
Expand Down
2 changes: 1 addition & 1 deletion sahara/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"operatingsystemrelease": ["8"]
}
],
"description": "Installs and configures OpenStack Sahara (Hadoop).",
"description": "Installs and configures OpenStack Sahara (Data Processing).",
"dependencies": [
{ "name": "duritong/sysctl", "version_requirement": ">=0.0.1 <1.0.0" },
{ "name": "stackforge/keystone", "version_requirement": ">=5.0.0 <6.0.0" },
Expand Down

0 comments on commit ab66863

Please sign in to comment.