openstack
/
tripleo-quickstart
Code Issues Proposed changes

Combined featureset for OVB ha/nonha job 

Create a featureset file which includes both ha and nonha settings
for OVB job in TripleO.

Change-Id: I3de035fe60ad8a6abc6d1d336eb066b1cbc6b57c
This commit is contained in:
Sagi Shnaidman 2017-04-06 14:40:16 +03:00
parent 7900e43233
commit 781f2a322d
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
config/general_config/featureset001.yml
View File

@ -3,26 +3,37 @@
# This enables TLS for the undercloud which will also make haproxy bind to the
# configured public-vip and admin-vip.
undercloud_generate_service_certificate: True
undercloud_generate_service_certificate: true
ssl_overcloud: true
overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates
# We don't need introspection in a virtual environment (because we are
# creating all the "hardware" we really know the necessary
# information).
step_introspect: true
# Tell tripleo about our environment.
enable_pacemaker: true
network_isolation: true
network_isolation_type: "multiple-nics"
network_isolation_args: >-
-e {{ overcloud_templates_path }}/environments/network-isolation.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
# Network settings
external_interface: eth2
external_interface_ip: 10.0.0.1
external_interface_netmask: 255.255.255.0
external_interface_hwaddr: fa:16:3e:79:e8:04
floating_ip_cidr: 10.0.0.0/24
step_adjust_mtu: true
mtu: 1350
mtu_interface:
- eth0
- eth1
- eth2
overcloud_dns_servers:
- 8.8.8.8
- 8.8.4.4
extra_args: >-
--ntp-server pool.ntp.org
test_ping: true
enable_pacemaker: true
run_tempest: false

6
doc/source/feature-configuration.rst
View File

@ -24,11 +24,11 @@ in each feature set configuration file in each column.
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| SSL UC | X | X | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| SSL OC | | X | | | | | | | |
| SSL OC | X | X | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| net iso SN | X | X | | | | | | | |
| net iso SN | | X | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| net iso MN | | | | | | | | | |
| net iso MN | X | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| net iso BOND | | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+