Skip to content
Snippets Groups Projects
Commit 97911e0d authored by Riccardo Bucchi's avatar Riccardo Bucchi
Browse files

fixed last merge conflict due to examples/manifest(s)

parent d7062238
No related branches found
No related tags found
1 merge request!8Development
Hide whitespace changes
Inline Side-by-side
examples/Puppetfile deleted 100644 → 0
+ 0
− 39
View file @ d7062238
#!/usr/bin/env ruby
#^syntax detection
forge "https://forgeapi.puppetlabs.com"
# use dependencies defined in metadata.json
metadata
# use dependencies defined in Modulefile
# modulefile
# A module from the Puppet Forge
# mod 'puppetlabs-stdlib'
# A module from git
# mod 'puppetlabs-ntp',
# :git => 'git://github.com/puppetlabs/puppetlabs-ntp.git'
#mod 'puppetlabs/puppet',
# :git => "git://github.com/puppetlabs/puppetlabs-puppet"
mod 'puppet/ceph',
:git => 'git://github.com/stackforge/puppet-ceph'
# A module from a git branch/tag
#mod 'puppetlabs-apt',
# :git => 'https://github.com/puppetlabs/puppetlabs-apt.git',
# :ref => '1.4.x'
mod 'puppet/staging',
:git => 'git://github.com/nanliu/puppet-staging'
# :ref => '1.0.4'
#mod 'puppetdb',
# :git => "git://github.com/puppetlabs/puppetlabs-puppetdb",
# :ref => '5.0.0'
# Modulo percona a discapito di Quentin mysql-galera, di Traldi
mod 'ocp-tools/percona',
:git => "https://baltig.infn.it/ocp-tools/percona.git"
# A module from Github pre-packaged tarball
# mod 'puppetlabs-apache', '0.6.0', :github_tarball => 'puppetlabs/puppetlabs-apache'
examples/manifest/site.pp deleted 100644 → 0
+ 0
− 91
View file @ d7062238
Exec {
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin'
}
hiera_include('default')
# PARAMS
# ======
$ha_servers = {
priority_hostname => 'ocp-tb-1',
priority_ip => '192.168.0.18',
hostnames => ['ocp-tb-2', 'ocp-tb-3'],
ips => ['192.168.0.19', '192.168.0.20'],
}
$mysql_users = {
'keystone@192.168.0.2*' => {
password_hash => mysql_password('keystone'),
},
'glance@192.168.0.2*' => {
password_hash => mysql_password('glance'),
},
'nova@192.168.0.2*' => {
password_hash => mysql_password('nova'),
},
'cinder@192.168.0.2*' => {
password_hash => mysql_password('cinder'),
},
'neutron@192.168.0.2*' => {
password_hash => mysql_password('neutron'),
},
}
$mysql_databases = {
'keystone' => {},
'glance' => {},
'nova' => {},
'cinder' => {},
'neutron' => {},
}
$mysql_grants = {
'keystone@192.168.0.2*/*.*' => {
user => 'keystone@192.168.0.2*',
},
'glance@192.168.0.2*/*.*' => {
user => 'glance@192.168.0.2*',
},
'nova@192.168.0.2*/*.*' => {
user => 'nova@192.168.0.2*',
},
'cinder@192.168.0.2*/*.*' => {
user => 'cinder@192.168.0.2*',
},
'neutron@192.168.0.2*/*.*' => {
user => 'neutron@192.168.0.2*',
},
}
# NODE DEFINITION
# ===============
node 'ocp-tb-1.openstacklocal' {
class {'iaas::role::rhmk':
# percona_master => true,
keepalived_state => 'MASTER',
keepalived_priority => 102,
ha_servers => $ha_servers,
mysql_users => $mysql_users,
mysql_databases => $mysql_databases,
mysql_grants => $mysql_grants,
}
}
node 'ocp-tb-2.openstacklocal' {
class {'iaas::role::rhmk':
keepalived_state => 'BACKUP',
keepalived_priority => 101,
ha_servers => $ha_servers,
mysql_users => $mysql_users,
mysql_databases => $mysql_databases,
mysql_grants => $mysql_grants,
}
}
node 'ocp-tb-3.openstacklocal' {
class {'iaas::role::rhmk':
keepalived_state => 'BACKUP',
keepalived_priority => 100,
ha_servers => $ha_servers,
mysql_users => $mysql_users,
mysql_databases => $mysql_databases,
mysql_grants => $mysql_grants,
}
}
examples/manifests/site.pp
+ 91
− 0
View file @ 97911e0d
......@@ -4,6 +4,97 @@ Exec {
hiera_include('default')
# PARAMS
# ======
$ha_servers = {
priority_hostname => 'ocp-tb-1',
priority_ip => '192.168.0.18',
hostnames => ['ocp-tb-2', 'ocp-tb-3'],
ips => ['192.168.0.19', '192.168.0.20'],
}
$mysql_users = {
'keystone@192.168.0.2*' => {
password_hash => mysql_password('keystone'),
},
'glance@192.168.0.2*' => {
password_hash => mysql_password('glance'),
},
'nova@192.168.0.2*' => {
password_hash => mysql_password('nova'),
},
'cinder@192.168.0.2*' => {
password_hash => mysql_password('cinder'),
},
'neutron@192.168.0.2*' => {
password_hash => mysql_password('neutron'),
},
}
$mysql_databases = {
'keystone' => {},
'glance' => {},
'nova' => {},
'cinder' => {},
'neutron' => {},
}
$mysql_grants = {
'keystone@192.168.0.2*/*.*' => {
user => 'keystone@192.168.0.2*',
},
'glance@192.168.0.2*/*.*' => {
user => 'glance@192.168.0.2*',
},
'nova@192.168.0.2*/*.*' => {
user => 'nova@192.168.0.2*',
},
'cinder@192.168.0.2*/*.*' => {
user => 'cinder@192.168.0.2*',
},
'neutron@192.168.0.2*/*.*' => {
user => 'neutron@192.168.0.2*',
},
}
# NODE DEFINITION
# ===============
## RHMK NODES
node 'ocp-tb-1.openstacklocal' {
class {'iaas::role::rhmk':
# percona_master => true,
keepalived_state => 'MASTER',
keepalived_priority => 102,
ha_servers => $ha_servers,
mysql_users => $mysql_users,
mysql_databases => $mysql_databases,
mysql_grants => $mysql_grants,
}
}
node 'ocp-tb-2.openstacklocal' {
class {'iaas::role::rhmk':
keepalived_state => 'BACKUP',
keepalived_priority => 101,
ha_servers => $ha_servers,
mysql_users => $mysql_users,
mysql_databases => $mysql_databases,
mysql_grants => $mysql_grants,
}
}
node 'ocp-tb-3.openstacklocal' {
class {'iaas::role::rhmk':
keepalived_state => 'BACKUP',
keepalived_priority => 100,
ha_servers => $ha_servers,
mysql_users => $mysql_users,
mysql_databases => $mysql_databases,
mysql_grants => $mysql_grants,
}
}
## CEPH STORAGE NODES
node '<storage_hostname>' {
include 'iaas::role::storage'
......
examples/metadata.json deleted 100644 → 0
+ 0
− 69
View file @ d7062238
{
"name": "iaas",
"version": "0.1.1",
"author": "OCP",
"summary": "Install, configure, and manage a full installation of OpenStack Juno",
"license": "Apache-2.0",
"source": "to_define",
"project_page": "to_define",
"issues_url": "to_define",
"requirements": [
{
"name": "pe",
"version_requirement": "3.x"
},
{
"name": "puppet",
"version_requirement": "3.x"
}
],
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"6",
"7"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"14.04"
]
}
],
"description": "Using a hiera-based roles and profiles model, do simple OpenStack deployments.",
"dependencies": [
{"name":"stackforge/ceilometer","version_requirement":"5.1.0"},
{"name":"stackforge/cinder","version_requirement":"5.1.0"},
{"name":"stackforge/glance","version_requirement":"5.1.0"},
{"name":"stackforge/heat","version_requirement":"5.1.0"},
{"name":"stackforge/horizon","version_requirement":"5.1.0"},
{"name":"stackforge/keystone","version_requirement":"5.1.0"},
{"name":"stackforge/neutron","version_requirement":"5.1.0"},
{"name":"stackforge/nova","version_requirement":"5.1.0"},
{"name":"stackforge/swift","version_requirement":"5.1.0"},
{"name":"stackforge/tempest","version_requirement":"5.1.0"},
{"name":"puppetlabs/apache","version_requirement":"1.6.0"},
{"name":"puppetlabs/firewall","version_requirement":"1.7.0"},
{"name":"puppetlabs/ntp","version_requirement":"4.1.0"},
{"name":"puppetlabs/rabbitmq","version_requirement":"3.1.0"},
{"name":"puppetlabs/stdlib","version_requirement":"4.8.0"},
{"name":"puppetlabs/mysql","version_requirement":"2.3.0"},
{"name":"puppetlabs/xinetd"},
{"name":"stackforge/vswitch","version_requirement":"1.1.0"},
{"name":"garethr/erlang","version_requirement":"0.2.0"},
{"name":"adrien/boolean","version_requirement":"1.0.1"},
{"name":"adrien/filemapper","version_requirement":"1.1.3"},
{"name":"adrien/network","version_requirement":"0.4.2"},
{"name":"aimonb/aviator","version_requirement":"0.5.1"},
{"name":"saz/resolv_conf"},
{"name":"saz/locales"},
{"name":"saz/timezone"},
{"name":"arioch/keepalived"},
{"name":"duritong/sysctl"},
{"name":"camptocamp/kmod"},
{"name":"puppetlabs/haproxy"},
{"name":"puppetlabs/postgresql","version_requirement":"4.0.0"}
]
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment