summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Ilyin <dilyin@mirantis.com>2016-11-07 08:53:29 -0800
committerDmitry Ilyin <dilyin@mirantis.com>2016-11-07 08:53:29 -0800
commitbe9595d57f0fde7f45d737c5bb42ac558f388a6b (patch)
tree6e418af87ced8324ebdc0dedde047851209637c3
parentd83d436ae7d293b1a7449b8104dfbf9a3dc9b436 (diff)
Remove advanced configuration data
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+2: Dmitry Ilyin <dilyin@mirantis.com> Workflow+1: Dmitry Ilyin <dilyin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 07 Nov 2016 19:45:26 +0000 Reviewed-on: https://review.openstack.org/394532 Project: openstack/fuel-noop-fixtures Branch: refs/heads/master
-rw-r--r--hiera/override/keystone-keystone.yaml12
-rw-r--r--hiera/override/openstack-controller-openstack-controller.yaml11
-rw-r--r--hiera/override/openstack-network-agents-dhcp.yaml5
-rw-r--r--hiera/override/openstack-network-agents-l3.yaml5
-rw-r--r--hiera/override/openstack-network-agents-metadata.yaml5
-rw-r--r--hiera/override/openstack-network-plugins-ml2.yaml5
-rw-r--r--hiera/override/openstack-network-server-config.yaml11
-rw-r--r--hiera/override/roles-compute.yaml11
8 files changed, 0 insertions, 65 deletions
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 @@
1--- 1---
2workers_max: 4 2workers_max: 4
3configuration:
4 keystone_config:
5 DEFAULT/default_publisher_id:
6 ensure: absent
7 DEFAULT/crypt_strength:
8 value: 6000
9 trust/allow_redelegation:
10 value: true
11 ec2/driver:
12 value: keystone.contrib.ec2.backends.kvs.Ec2
13 policy/driver:
14 ensure: absent
15network_metadata: 3network_metadata:
16 vips: 4 vips:
17 management: 5 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 @@
1--- 1---
2nova: 2nova:
3 workers: 4 3 workers: 4
4configuration:
5 nova_config:
6 DEFAULT/debug:
7 value: True
8 DEFAULT/verbose:
9 value: True
10 DEFAULT/notification_driver:
11 ensure: absent
12 nova_paste_api_ini:
13 DEFAULT/test:
14 value: True
15network_metadata: 4network_metadata:
16 vips: 5 vips:
17 management: 6 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 @@
1---
2configuration:
3 neutron_dhcp_agent_config:
4 DEFAULT/resync_interval:
5 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 @@
1---
2configuration:
3 neutron_l3_agent_config:
4 DEFAULT/send_arp_for_ha:
5 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 @@
1---
2configuration:
3 neutron_metadata_agent_config:
4 DEFAULT/debug:
5 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 @@
1---
2configuration:
3 neutron_agent_ovs:
4 agent/polling_interval:
5 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 @@
1---
2configuration:
3 neutron_config:
4 DEFAULT/debug:
5 value: True
6 neutron_api_config:
7 test/test:
8 value: 20
9 neutron_plugin_ml2:
10 test/polling_interval:
11 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 @@
1--- 1---
2host_uuid: '00000000-0000-0000-0000-000000000000' 2host_uuid: '00000000-0000-0000-0000-000000000000'
3configuration:
4 nova_config:
5 DEFAULT/debug:
6 value: True
7 DEFAULT/verbose:
8 value: True
9 DEFAULT/notification_driver:
10 ensure: absent
11 nova_paste_api_ini:
12 DEFAULT/test:
13 value: True
14network_metadata: 3network_metadata:
15 vips: 4 vips:
16 management: 5 management: