Merge "Remove static hieradata"
This commit is contained in:
commit
173ce97b0c
|
@ -275,7 +275,6 @@ resources:
|
|||
extraconfig:
|
||||
mapped_data: {get_param: ExtraConfig}
|
||||
ceph:
|
||||
raw_data: {get_file: hieradata/ceph.yaml}
|
||||
mapped_data:
|
||||
tripleo::packages::enable_install: {get_input: enable_package_install}
|
||||
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
|
||||
|
|
|
@ -282,7 +282,6 @@ resources:
|
|||
extraconfig:
|
||||
mapped_data: {get_param: ExtraConfig}
|
||||
volume:
|
||||
raw_data: {get_file: hieradata/volume.yaml}
|
||||
mapped_data:
|
||||
# Cinder
|
||||
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
|
||||
|
|
|
@ -368,7 +368,6 @@ resources:
|
|||
- service_configs
|
||||
- compute
|
||||
- ceph_cluster # provided by CephClusterConfig
|
||||
- ceph
|
||||
- all_nodes # provided by allNodesConfig
|
||||
- '"%{::osfamily}"'
|
||||
- network
|
||||
|
@ -393,10 +392,7 @@ resources:
|
|||
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
|
||||
net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]}
|
||||
net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
|
||||
ceph:
|
||||
raw_data: {get_file: hieradata/ceph.yaml}
|
||||
compute:
|
||||
raw_data: {get_file: hieradata/compute.yaml}
|
||||
mapped_data:
|
||||
cinder_enable_nfs_backend: {get_input: cinder_enable_nfs_backend}
|
||||
nova::use_ipv6: {get_input: nova_ipv6}
|
||||
|
|
|
@ -604,7 +604,6 @@ resources:
|
|||
- service_configs
|
||||
- service_names
|
||||
- controller
|
||||
- object
|
||||
- swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
|
||||
- ceph_cluster # provided by CephClusterConfig
|
||||
- ceph
|
||||
|
@ -640,15 +639,11 @@ resources:
|
|||
net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]}
|
||||
net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
|
||||
ceph:
|
||||
raw_data: {get_file: hieradata/ceph.yaml}
|
||||
mapped_data:
|
||||
ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
|
||||
ceph::profile::params::public_network: {get_input: ceph_public_network}
|
||||
ceph::profile::params::public_addr: {get_input: ceph_public_ip}
|
||||
object:
|
||||
raw_data: {get_file: hieradata/object.yaml}
|
||||
controller:
|
||||
raw_data: {get_file: hieradata/controller.yaml}
|
||||
mapped_data: # data supplied directly to this deployment configuration, etc
|
||||
bootstack_nodeid: {get_input: bootstack_nodeid}
|
||||
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Do not add more hieradata in this directory, and use composable services.
|
|
@ -1,2 +0,0 @@
|
|||
# Do not add hieradata in this file, and use composable services.
|
||||
ceph_classes: []
|
|
@ -1,3 +0,0 @@
|
|||
# Do not add hieradata in this file, and use composable services.
|
||||
|
||||
compute_classes: []
|
|
@ -1,3 +0,0 @@
|
|||
# Do not add hieradata in this file, and use composable services.
|
||||
|
||||
controller_classes: []
|
|
@ -1,3 +0,0 @@
|
|||
# Do not add hieradata in this file, and use composable services.
|
||||
|
||||
object_classes: []
|
|
@ -1,3 +0,0 @@
|
|||
# Do not add hieradata in this file, and use composable services.
|
||||
|
||||
volume_classes: []
|
|
@ -17,7 +17,7 @@ include ::tripleo::packages
|
|||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('ceph_classes')
|
||||
hiera_include('ceph_classes', [])
|
||||
}
|
||||
|
||||
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_ceph', hiera('step')])
|
||||
|
|
|
@ -17,7 +17,7 @@ include ::tripleo::packages
|
|||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('compute_classes')
|
||||
hiera_include('compute_classes', [])
|
||||
}
|
||||
|
||||
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_compute', hiera('step')])
|
||||
|
|
|
@ -17,8 +17,8 @@ include ::tripleo::packages
|
|||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('controller_classes')
|
||||
} #END STEP 4
|
||||
hiera_include('controller_classes', [])
|
||||
}
|
||||
|
||||
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])
|
||||
package_manifest{$package_manifest_name: ensure => present}
|
||||
|
|
|
@ -16,17 +16,9 @@
|
|||
include ::tripleo::packages
|
||||
include ::tripleo::firewall
|
||||
|
||||
if $::hostname == downcase(hiera('bootstrap_nodeid')) {
|
||||
$pacemaker_master = true
|
||||
$sync_db = true
|
||||
} else {
|
||||
$pacemaker_master = false
|
||||
$sync_db = false
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('controller_classes', [])
|
||||
}
|
||||
|
||||
if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) {
|
||||
hiera_include('controller_classes')
|
||||
} #END STEP 4
|
||||
|
||||
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller_pacemaker', hiera('step')])
|
||||
package_manifest{$package_manifest_name: ensure => present}
|
||||
|
|
|
@ -17,7 +17,7 @@ include ::tripleo::packages
|
|||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('object_classes')
|
||||
hiera_include('object_classes', [])
|
||||
}
|
||||
|
||||
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_object', hiera('step')])
|
||||
|
|
|
@ -17,7 +17,7 @@ include ::tripleo::packages
|
|||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('volume_classes')
|
||||
hiera_include('volume_classes', [])
|
||||
}
|
||||
|
||||
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_volume', hiera('step')])
|
||||
|
|
|
@ -269,7 +269,6 @@ resources:
|
|||
extraconfig:
|
||||
mapped_data: {get_param: ExtraConfig}
|
||||
object:
|
||||
raw_data: {get_file: hieradata/object.yaml}
|
||||
mapped_data: # data supplied directly to this deployment configuration, etc
|
||||
swift::swift_hash_path_suffix: { get_input: swift_hash_suffix }
|
||||
swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
|
||||
|
|
Loading…
Reference in New Issue