From be9595d57f0fde7f45d737c5bb42ac558f388a6b Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <dilyin@mirantis.com>
Date: Mon, 7 Nov 2016 08:53:29 -0800
Subject: [PATCH] Remove advanced configuration data

Change-Id: I8171a669f118d05eec5c503132e3649cf9c31308
---
 hiera/override/keystone-keystone.yaml                | 12 ------------
 .../openstack-controller-openstack-controller.yaml   | 11 -----------
 hiera/override/openstack-network-agents-dhcp.yaml    |  5 -----
 hiera/override/openstack-network-agents-l3.yaml      |  5 -----
 .../override/openstack-network-agents-metadata.yaml  |  5 -----
 hiera/override/openstack-network-plugins-ml2.yaml    |  5 -----
 hiera/override/openstack-network-server-config.yaml  | 11 -----------
 hiera/override/roles-compute.yaml                    | 11 -----------
 8 files changed, 65 deletions(-)
 delete mode 100644 hiera/override/openstack-network-agents-dhcp.yaml
 delete mode 100644 hiera/override/openstack-network-agents-l3.yaml
 delete mode 100644 hiera/override/openstack-network-agents-metadata.yaml
 delete mode 100644 hiera/override/openstack-network-plugins-ml2.yaml
 delete mode 100644 hiera/override/openstack-network-server-config.yaml

diff --git a/hiera/override/keystone-keystone.yaml b/hiera/override/keystone-keystone.yaml
index 6f77491..708c28e 100644
--- a/hiera/override/keystone-keystone.yaml
+++ b/hiera/override/keystone-keystone.yaml
@@ -1,17 +1,5 @@
 ---
 workers_max: 4
-configuration:
-  keystone_config:
-    DEFAULT/default_publisher_id:
-      ensure: absent
-    DEFAULT/crypt_strength:
-      value: 6000
-    trust/allow_redelegation:
-      value: true
-    ec2/driver:
-      value: keystone.contrib.ec2.backends.kvs.Ec2
-    policy/driver:
-      ensure: absent
 network_metadata:
   vips:
     management:
diff --git a/hiera/override/openstack-controller-openstack-controller.yaml b/hiera/override/openstack-controller-openstack-controller.yaml
index 3c13b07..8e54b19 100644
--- a/hiera/override/openstack-controller-openstack-controller.yaml
+++ b/hiera/override/openstack-controller-openstack-controller.yaml
@@ -1,17 +1,6 @@
 ---
 nova:
   workers: 4
-configuration:
-  nova_config:
-    DEFAULT/debug:
-      value: True
-    DEFAULT/verbose:
-      value: True
-    DEFAULT/notification_driver:
-      ensure: absent
-  nova_paste_api_ini:
-    DEFAULT/test:
-      value: True
 network_metadata:
   vips:
     management:
diff --git a/hiera/override/openstack-network-agents-dhcp.yaml b/hiera/override/openstack-network-agents-dhcp.yaml
deleted file mode 100644
index 6ab0edd..0000000
--- a/hiera/override/openstack-network-agents-dhcp.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-configuration:
-  neutron_dhcp_agent_config:
-    DEFAULT/resync_interval:
-      value: 25
diff --git a/hiera/override/openstack-network-agents-l3.yaml b/hiera/override/openstack-network-agents-l3.yaml
deleted file mode 100644
index d59670a..0000000
--- a/hiera/override/openstack-network-agents-l3.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-configuration:
-  neutron_l3_agent_config:
-    DEFAULT/send_arp_for_ha:
-      value: 5
diff --git a/hiera/override/openstack-network-agents-metadata.yaml b/hiera/override/openstack-network-agents-metadata.yaml
deleted file mode 100644
index d0df5d1..0000000
--- a/hiera/override/openstack-network-agents-metadata.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-configuration:
-  neutron_metadata_agent_config:
-    DEFAULT/debug:
-      value: True
diff --git a/hiera/override/openstack-network-plugins-ml2.yaml b/hiera/override/openstack-network-plugins-ml2.yaml
deleted file mode 100644
index b2d752e..0000000
--- a/hiera/override/openstack-network-plugins-ml2.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-configuration:
-  neutron_agent_ovs:
-    agent/polling_interval:
-      value: 15
diff --git a/hiera/override/openstack-network-server-config.yaml b/hiera/override/openstack-network-server-config.yaml
deleted file mode 100644
index 3b44d8b..0000000
--- a/hiera/override/openstack-network-server-config.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-configuration:
-  neutron_config:
-    DEFAULT/debug:
-      value: True
-  neutron_api_config:
-    test/test:
-      value: 20
-  neutron_plugin_ml2:
-    test/polling_interval:
-      value: 10
diff --git a/hiera/override/roles-compute.yaml b/hiera/override/roles-compute.yaml
index 8c0bdb9..60d53d3 100644
--- a/hiera/override/roles-compute.yaml
+++ b/hiera/override/roles-compute.yaml
@@ -1,16 +1,5 @@
 ---
 host_uuid: '00000000-0000-0000-0000-000000000000'
-configuration:
-  nova_config:
-    DEFAULT/debug:
-      value: True
-    DEFAULT/verbose:
-      value: True
-    DEFAULT/notification_driver:
-      ensure: absent
-  nova_paste_api_ini:
-    DEFAULT/test:
-      value: True
 network_metadata:
   vips:
     management: