Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[state] virtual_init: Limit to mas01 on baremetal"
[fuel.git]
/
mcp
/
reclass
/
classes
/
cluster
/
mcp-common-noha
/
openstack_init.yml.j2
diff --git
a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
index
2e0a131
..
5aae27c
100644
(file)
--- a/
mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/
mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
@@
-9,9
+9,6
@@
---
parameters:
_param:
---
parameters:
_param:
- openstack_version: queens
- apt_mk_version: nightly
- mcp_repo_version: 1.1
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
@@
-92,7
+89,13
@@
parameters:
mysql_barbican_password: opnfv_secret
keystone_barbican_password: opnfv_secret
barbican_simple_crypto_kek: "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY="
mysql_barbican_password: opnfv_secret
keystone_barbican_password: opnfv_secret
barbican_simple_crypto_kek: "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY="
- barbican_integration_enabled: false
+ barbican_integration_enabled: true
+
+{%- if '-sfc-' in conf.MCP_DEPLOY_SCENARIO %}
+ tacker_service_host: ${_param:cluster_local_address}
+ keystone_tacker_password: opnfv_secret
+ mysql_tacker_password: opnfv_secret
+{%- endif %}
aodh_version: ${_param:openstack_version}
keystone_aodh_password: opnfv_secret
aodh_version: ${_param:openstack_version}
keystone_aodh_password: opnfv_secret
@@
-115,6
+118,15
@@
parameters:
net.ipv4.tcp_congestion_control: yeah
net.ipv4.tcp_slow_start_after_idle: 0
net.ipv4.tcp_fin_timeout: 30
net.ipv4.tcp_congestion_control: yeah
net.ipv4.tcp_slow_start_after_idle: 0
net.ipv4.tcp_fin_timeout: 30
+ repo:
+ uca:
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
+ pin:
+ - pin: 'release o=Canonical'
+ priority: 1200
+ package: 'openvswitch* python-openvswitch ovn* dpdk* libdpdk*'
network:
host:
ctl:
network:
host:
ctl: