Remove static hieradata

Static hieradata moved to composable services, we don't need the files
anymore. It also cleanup how we construct Hieradata configuration by
removing unused hiera files.

Change-Id: I19f85b6c1b734473cf908ddaca29ad966f9f5405

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 2f00753..280a5f7 100644 (file)
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -274,7 +274,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}

diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 28f1686..a72ca35 100644 (file)
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -281,7 +281,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}

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 1ae55cd..0b2f590 100644 (file)
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -367,7 +367,6 @@ resources:
             - service_configs
             - compute
             - ceph_cluster # provided by CephClusterConfig
-            - ceph
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
             - network
@@ -392,10 +391,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}

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 93ba476..3d2cdc7 100644 (file)
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -618,7 +618,6 @@ resources:
             - service_configs
             - service_names
             - controller
-            - object
             - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
             - ceph_cluster # provided by CephClusterConfig
             - ceph
@@ -654,15 +653,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}
 

diff --git a/puppet/hieradata/README.rst b/puppet/hieradata/README.rst
deleted file mode 100644 (file)
index 64a6022..0000000
--- a/puppet/hieradata/README.rst
+++ /dev/null
@@ -1 +0,0 @@
-Do not add more hieradata in this directory, and use composable services.

diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml
deleted file mode 100644 (file)
index c8c5804..0000000
--- a/puppet/hieradata/ceph.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-# Do not add hieradata in this file, and use composable services.
-ceph_classes: []

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
deleted file mode 100644 (file)
index 54b3d41..0000000
--- a/puppet/hieradata/compute.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not add hieradata in this file, and use composable services.
-
-compute_classes: []

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
deleted file mode 100644 (file)
index d18e0bc..0000000
--- a/puppet/hieradata/controller.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not add hieradata in this file, and use composable services.
-
-controller_classes: []

diff --git a/puppet/hieradata/object.yaml b/puppet/hieradata/object.yaml
deleted file mode 100644 (file)
index 5aa0cfb..0000000
--- a/puppet/hieradata/object.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not add hieradata in this file, and use composable services.
-
-object_classes: []

diff --git a/puppet/hieradata/volume.yaml b/puppet/hieradata/volume.yaml
deleted file mode 100644 (file)
index 42b85e1..0000000
--- a/puppet/hieradata/volume.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not add hieradata in this file, and use composable services.
-
-volume_classes: []

diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index 152694d..df83496 100644 (file)
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -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')])

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index ab7f846..19ec575 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -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')])

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 69e48e9..30e7c8d 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -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}

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 0aec972..a782207 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -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}

diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp
index 1f04c58..18e90d1 100644 (file)
--- a/puppet/manifests/overcloud_object.pp
+++ b/puppet/manifests/overcloud_object.pp
@@ -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')])

diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index 7c7da58..f678771 100644 (file)
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -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')])

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 5e331f4..b452d8c 100644 (file)
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -268,7 +268,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}