Add pillars with default policy configuration for OS services
PROD-34318
Change-Id: I46dee301c78450b2aa7a6430de1f3432756688d8
diff --git a/horizon/server/plugin/designate.yml b/horizon/server/plugin/designate.yml
index 8fc7833..b170573 100644
--- a/horizon/server/plugin/designate.yml
+++ b/horizon/server/plugin/designate.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.openstack.policy.all
parameters:
horizon:
server:
@@ -9,8 +11,5 @@
policy:
dns:
enabled: true
- source: 'mine'
- target_type: 'compound'
- host: 'I@designate:server:role:primary'
- grain_name: ${_param:horizon_dashboard_designate_grain}
- name: ${_param:horizon_dashboard_designate_file}
\ No newline at end of file
+ source: pillar
+ pillar: ${_param:designate_default_policy_${_param:openstack_version}}
diff --git a/horizon/server/plugin/heat.yml b/horizon/server/plugin/heat.yml
index 909da66..6a1bcb0 100644
--- a/horizon/server/plugin/heat.yml
+++ b/horizon/server/plugin/heat.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.openstack.policy.all
parameters:
horizon:
server:
@@ -8,6 +10,6 @@
name: python-heat-dashboard
policy:
orchestration:
+ source: pillar
+ pillar: ${_param:heat_default_policy_${_param:openstack_version}}
enabled: true
- name: heat_policy.json
- source: file
diff --git a/horizon/server/plugin/manila.yml b/horizon/server/plugin/manila.yml
index ec00da6..94fb4b8 100644
--- a/horizon/server/plugin/manila.yml
+++ b/horizon/server/plugin/manila.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.openstack.policy.all
parameters:
horizon:
server:
@@ -8,10 +10,10 @@
name: python-manila-ui
policy:
share:
- source: file
- name: manila_policy.json
enabled: true
+ source: pillar
+ pillar: ${_param:manila_default_policy_${_param:openstack_version}}
sharev2:
- source: file
- name: manila_policy.json
enabled: true
+ source: pillar
+ pillar: ${_param:manila_default_policy_${_param:openstack_version}}
diff --git a/horizon/server/plugin/neutron_bgpvpn.yml b/horizon/server/plugin/neutron_bgpvpn.yml
index 7ad75ff..69dd4be 100644
--- a/horizon/server/plugin/neutron_bgpvpn.yml
+++ b/horizon/server/plugin/neutron_bgpvpn.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.openstack.policy.all
parameters:
horizon:
server:
@@ -6,3 +8,8 @@
source:
engine: pkg
name: python-networking-bgpvpn
+ policy:
+ bgpvpn:
+ enabled: true
+ source: pillar
+ pillar: ${_param:bgpvpn_default_policy_${_param:openstack_version}}
diff --git a/horizon/server/plugin/octavia.yml b/horizon/server/plugin/octavia.yml
index 576fd5b..b029b31 100644
--- a/horizon/server/plugin/octavia.yml
+++ b/horizon/server/plugin/octavia.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.openstack.policy.all
parameters:
horizon:
server:
@@ -9,6 +11,5 @@
policy:
octavia:
enabled: true
- name: octavia_policy.json
- source: file
-
+ source: pillar
+ pillar: ${_param:octavia_default_policy_${_param:openstack_version}}
diff --git a/horizon/server/plugin/telemetry.yml b/horizon/server/plugin/telemetry.yml
index a944111..8f62b0e 100644
--- a/horizon/server/plugin/telemetry.yml
+++ b/horizon/server/plugin/telemetry.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.openstack.policy.all
parameters:
_param:
horizon_telemetry_engine: graphite
@@ -19,3 +21,8 @@
horizon_overrides:
overrides:
- horizon_telemetry
+ policy:
+ telemetry:
+ enabled: true
+ source: pillar
+ pillar: ${_param:telemetry_default_policy_${_param:openstack_version}}