placement: Use puppet-placement to deploy an extracted service
This change introduces an extracted placement class capable of deploying the service using puppet-placement ahead of the official extraction of the service from Nova in Train. scenario001 continues to deploy Placement using the now deprecated puppet-nova classes ahead of their removal in Train. Change-Id: I5260b4d3478008a76fbe53fdbb716004d11b22df
This commit is contained in:
parent
2457c0aca0
commit
39de59e91a
@ -109,6 +109,10 @@ mod 'panko',
|
|||||||
:git => 'https://git.openstack.org/openstack/puppet-panko',
|
:git => 'https://git.openstack.org/openstack/puppet-panko',
|
||||||
:ref => 'master'
|
:ref => 'master'
|
||||||
|
|
||||||
|
mod 'placement',
|
||||||
|
:git => 'https://git.openstack.org/openstack/puppet-placement',
|
||||||
|
:ref => 'master'
|
||||||
|
|
||||||
mod 'qdr',
|
mod 'qdr',
|
||||||
:git => 'https://git.openstack.org/openstack/puppet-qdr',
|
:git => 'https://git.openstack.org/openstack/puppet-qdr',
|
||||||
:ref => 'master'
|
:ref => 'master'
|
||||||
|
@ -29,10 +29,8 @@ include ::openstack_integration::mysql
|
|||||||
include ::openstack_integration::keystone
|
include ::openstack_integration::keystone
|
||||||
include ::openstack_integration::glance
|
include ::openstack_integration::glance
|
||||||
include ::openstack_integration::neutron
|
include ::openstack_integration::neutron
|
||||||
include ::openstack_integration::nova_placement
|
include ::openstack_integration::placement
|
||||||
class { '::openstack_integration::nova':
|
include ::openstack_integration::nova
|
||||||
placement_database_connection => 'mysql+pymysql://nova_placement:nova@127.0.0.1/nova_placement?charset=utf8',
|
|
||||||
}
|
|
||||||
include ::openstack_integration::cinder
|
include ::openstack_integration::cinder
|
||||||
include ::openstack_integration::horizon
|
include ::openstack_integration::horizon
|
||||||
include ::openstack_integration::provision
|
include ::openstack_integration::provision
|
||||||
|
@ -46,10 +46,8 @@ class { '::openstack_integration::glance':
|
|||||||
}
|
}
|
||||||
include ::openstack_integration::neutron
|
include ::openstack_integration::neutron
|
||||||
include ::openstack_integration::swift
|
include ::openstack_integration::swift
|
||||||
include ::openstack_integration::nova_placement
|
include ::openstack_integration::placement
|
||||||
class { '::openstack_integration::nova':
|
include ::openstack_integration::nova
|
||||||
placement_database_connection => 'mysql+pymysql://nova_placement:nova@127.0.0.1/nova_placement?charset=utf8',
|
|
||||||
}
|
|
||||||
include ::openstack_integration::cinder
|
include ::openstack_integration::cinder
|
||||||
include ::openstack_integration::horizon
|
include ::openstack_integration::horizon
|
||||||
include ::openstack_integration::heat
|
include ::openstack_integration::heat
|
||||||
|
@ -80,10 +80,9 @@ include ::openstack_integration::ironic
|
|||||||
include ::openstack_integration::zaqar
|
include ::openstack_integration::zaqar
|
||||||
include ::openstack_integration::provision
|
include ::openstack_integration::provision
|
||||||
|
|
||||||
include ::openstack_integration::nova_placement
|
include ::openstack_integration::placement
|
||||||
class { '::openstack_integration::nova':
|
class { '::openstack_integration::nova':
|
||||||
volume_encryption => true,
|
volume_encryption => true,
|
||||||
placement_database_connection => 'mysql+pymysql://nova_placement:nova@127.0.0.1/nova_placement?charset=utf8',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::openstack_integration::cinder':
|
class { '::openstack_integration::cinder':
|
||||||
|
@ -91,10 +91,8 @@ include ::openstack_integration::glance
|
|||||||
class { '::openstack_integration::neutron':
|
class { '::openstack_integration::neutron':
|
||||||
driver => 'linuxbridge',
|
driver => 'linuxbridge',
|
||||||
}
|
}
|
||||||
include ::openstack_integration::nova_placement
|
include ::openstack_integration::placement
|
||||||
class { '::openstack_integration::nova':
|
include ::openstack_integration::nova
|
||||||
placement_database_connection => 'mysql+pymysql://nova_placement:nova@127.0.0.1/nova_placement?charset=utf8',
|
|
||||||
}
|
|
||||||
if $trove_enabled {
|
if $trove_enabled {
|
||||||
include ::openstack_integration::trove
|
include ::openstack_integration::trove
|
||||||
}
|
}
|
||||||
|
@ -83,10 +83,9 @@ class { '::openstack_integration::neutron':
|
|||||||
l2gw_enabled => $l2gw_enabled,
|
l2gw_enabled => $l2gw_enabled,
|
||||||
bgp_dragent_enabled => $bgp_dragent_enabled,
|
bgp_dragent_enabled => $bgp_dragent_enabled,
|
||||||
}
|
}
|
||||||
include ::openstack_integration::nova_placement
|
include ::openstack_integration::placement
|
||||||
class { '::openstack_integration::nova':
|
class { '::openstack_integration::nova':
|
||||||
libvirt_rbd => true,
|
libvirt_rbd => true,
|
||||||
placement_database_connection => 'mysql+pymysql://nova_placement:nova@127.0.0.1/nova_placement?charset=utf8',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::openstack_integration::ceph':
|
class { '::openstack_integration::ceph':
|
||||||
|
63
manifests/placement.pp
Normal file
63
manifests/placement.pp
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
# Configure the Placement service
|
||||||
|
|
||||||
|
class openstack_integration::placement {
|
||||||
|
|
||||||
|
include ::openstack_integration::config
|
||||||
|
include ::openstack_integration::params
|
||||||
|
|
||||||
|
include ::placement
|
||||||
|
|
||||||
|
if $::openstack_integration::config::ssl {
|
||||||
|
openstack_integration::ssl_key { 'placement':
|
||||||
|
notify => Service['httpd'],
|
||||||
|
require => Package['placement-common'],
|
||||||
|
}
|
||||||
|
Exec['update-ca-certificates'] ~> Service['httpd']
|
||||||
|
}
|
||||||
|
|
||||||
|
class { '::placement::db::mysql':
|
||||||
|
password => 'placement',
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($::os_package_type == 'debian') {
|
||||||
|
class { '::placement::keystone::auth':
|
||||||
|
public_url => "${::openstack_integration::config::base_url}:8778",
|
||||||
|
internal_url => "${::openstack_integration::config::base_url}:8778",
|
||||||
|
admin_url => "${::openstack_integration::config::base_url}:8778",
|
||||||
|
password => 'a_big_secret',
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
class { '::placement::keystone::auth':
|
||||||
|
public_url => "${::openstack_integration::config::base_url}:8778/placement",
|
||||||
|
internal_url => "${::openstack_integration::config::base_url}:8778/placement",
|
||||||
|
admin_url => "${::openstack_integration::config::base_url}:8778/placement",
|
||||||
|
password => 'a_big_secret',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
class { '::placement::keystone::authtoken':
|
||||||
|
password => 'a_big_secret',
|
||||||
|
user_domain_name => 'Default',
|
||||||
|
project_domain_name => 'Default',
|
||||||
|
auth_url => $::openstack_integration::config::keystone_admin_uri,
|
||||||
|
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
|
||||||
|
memcached_servers => $::openstack_integration::config::memcached_servers,
|
||||||
|
}
|
||||||
|
class { '::placement::logging':
|
||||||
|
debug => true,
|
||||||
|
}
|
||||||
|
class { '::placement::db':
|
||||||
|
database_connection => 'mysql+pymysql://placement:placement@127.0.0.1/placement?charset=utf8',
|
||||||
|
}
|
||||||
|
include ::placement::db::sync
|
||||||
|
include ::apache
|
||||||
|
if ($::os_package_type != 'debian') {
|
||||||
|
class { '::placement::wsgi::apache':
|
||||||
|
bind_host => $::openstack_integration::config::ip_for_url,
|
||||||
|
api_port => '8778',
|
||||||
|
ssl_key => "/etc/placement/ssl/private/${::fqdn}.pem",
|
||||||
|
ssl_cert => $::openstack_integration::params::cert_path,
|
||||||
|
ssl => $::openstack_integration::config::ssl,
|
||||||
|
workers => '2',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -25,6 +25,7 @@ openstacklib
|
|||||||
oslo
|
oslo
|
||||||
ovn
|
ovn
|
||||||
panko
|
panko
|
||||||
|
placement
|
||||||
qdr
|
qdr
|
||||||
sahara
|
sahara
|
||||||
swift
|
swift
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
- openstack/puppet-oslo
|
- openstack/puppet-oslo
|
||||||
- openstack/puppet-ovn
|
- openstack/puppet-ovn
|
||||||
- openstack/puppet-panko
|
- openstack/puppet-panko
|
||||||
|
- openstack/puppet-placement
|
||||||
- openstack/puppet-qdr
|
- openstack/puppet-qdr
|
||||||
- openstack/puppet-sahara
|
- openstack/puppet-sahara
|
||||||
- openstack/puppet-swift
|
- openstack/puppet-swift
|
||||||
|
Loading…
x
Reference in New Issue
Block a user