Merge pull request #1203 from ciecierski/tlse-hci-adoption

Modify hci scenario to use tls-e for OSP17.1 deployment

Author: openshift-merge-bot[bot]

scenarios/hci.yaml

@@ -3,7 +3,7 @@ undercloud:
   config:
     - section: DEFAULT
       option: undercloud_hostname
-      value: undercloud.example.com
+      value: osp-undercloud-0.ooo.test
     - section: DEFAULT
       option: undercloud_timezone
       value: UTC
@@ -22,7 +22,8 @@ undercloud:
   undercloud_parameters_override: "hci/hieradata_overrides_undercloud.yaml"
   undercloud_parameters_defaults: "hci/undercloud_parameter_defaults.yaml"
   ctlplane_vip: 192.168.122.98
-cloud_domain: "example.com"
+cloud_domain: "ooo.test"
+tlse: true
 hostname_groups_map:
   # map ansible groups in the inventory to role hostname format for
   # 17.1 deployment
@@ -58,6 +59,9 @@ stacks:
       - "/usr/share/openstack-tripleo-heat-templates/environments/cephadm/ceph-dashboard.yaml"
       - "/usr/share/openstack-tripleo-heat-templates/environments/services/barbican.yaml"
       - "/usr/share/openstack-tripleo-heat-templates/environments/barbican-backend-simple-crypto.yaml"
+      - "/usr/share/openstack-tripleo-heat-templates/environments/ssl/tls-everywhere-endpoints-dns.yaml"
+      - "/usr/share/openstack-tripleo-heat-templates/environments/services/haproxy-public-tls-certmonger.yaml"
+      - "/usr/share/openstack-tripleo-heat-templates/environments/ssl/enable-internal-tls.yaml"
     network_data_file: "hci/network_data.yaml.j2"
     vips_data_file: "hci/vips_data.yaml"
     roles_file: "hci/roles.yaml"

scenarios/hci/config_download.yaml

@@ -34,6 +34,7 @@ resource_registry:
   OS::TripleO::Services::HeatApiCfn: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-api-cfn-container-puppet.yaml
   OS::TripleO::Services::HeatApiCloudwatch: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
   OS::TripleO::Services::HeatEngine: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-engine-container-puppet.yaml
+  OS::TripleO::Services::IpaClient: /usr/share/openstack-tripleo-heat-templates/deployment/ipa/ipaservices-baremetal-ansible.yaml
 parameter_defaults:
   RedisVirtualFixedIPs:
     - ip_address: 192.168.122.110
@@ -55,18 +56,21 @@ parameter_defaults:
   ComputeHCICount: 3
   NeutronGlobalPhysnetMtu: 1350
   CinderLVMLoopDeviceSize: 20480
-  CloudName: overcloud.example.com
-  CloudNameInternal: overcloud.internalapi.example.com
-  CloudNameStorage: overcloud.storage.example.com
-  CloudNameStorageManagement: overcloud.storagemgmt.example.com
-  CloudNameCtlplane: overcloud.ctlplane.example.com
-  CloudDomain: example.com
+  CloudName: overcloud.ooo.test
+  CloudNameInternal: overcloud.internalapi.ooo.test
+  CloudNameStorage: overcloud.storage.ooo.test
+  CloudNameStorageManagement: overcloud.storagemgmt.ooo.test
+  CloudNameCtlplane: overcloud.ctlplane.ooo.test
+  CloudDomain: ooo.test
+  IdMServer: osp-free-ipa-0.ooo.test
+  IdMDomain: ooo.test
+  IdMInstallClientPackages: true
   NetworkConfigWithAnsible: false
   ControllerHostnameFormat: '%stackname%-controller-%index%'
   ComputeHCIHostnameFormat: '%stackname%-computehci-%index%'
   CtlplaneNetworkAttributes:
     network:
-      dns_domain: example.com
+      dns_domain: ooo.test
       mtu: 1500
       name: ctlplane
       tags: