Jelajahi Sumber

Switch the sample inventory to CentOS (#541)

* Switch the sample inventory to CentOS

This changes the image name and deployment types to use centos instead
of rhel and sets `rhsm_register` to false.

With these changes, the inventory should be immediately deployable
using the default values (assuming the image, network and flavor names
match).

Ideally, the upstream CI will just end up using this inventory with
little to no changes, too at some point.

* Specify the origin openshift_release
Tomas Sedovic 7 tahun lalu
induk
melakukan
9aa8a79f3e

+ 9 - 2
playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml

@@ -1,6 +1,8 @@
 ---
-openshift_deployment_type: openshift-enterprise
-openshift_release: v3.5
+openshift_deployment_type: origin
+openshift_release: 1.5.1
+#openshift_deployment_type: openshift-enterprise
+#openshift_release: v3.5
 openshift_master_default_subdomain: "apps.{{ env_id }}.{{ public_dns_domain }}"
 
 # NOTE(shadower): do not remove this line, otherwise the default node labels
@@ -9,6 +11,11 @@ openshift_node_labels: "{{ openstack.metadata.node_labels }}"
 
 osm_default_node_selector: 'region=primary'
 
+# NOTE(shadower): the hostname check seems to always fail because the
+# host's floating IP address doesn't match the address received from
+# inside the host.
+openshift_override_hostname_check: true
+
 # For POCs or demo environments that are using smaller instances than
 # the official recommended values for RAM and DISK, uncomment the line below.
 #openshift_disable_check: disk_availability,memory_availability

+ 3 - 1
playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml

@@ -4,7 +4,7 @@ public_dns_domain: "example.com"
 public_dns_nameservers: []
 
 openstack_ssh_public_key: "openshift"
-openstack_default_image_name: "rhel73"
+openstack_default_image_name: "centos7"
 openstack_default_flavor: "m1.medium"
 openstack_external_network_name: "public"
 
@@ -20,6 +20,8 @@ docker_volume_size: "15"
 openstack_subnet_prefix: "192.168.99"
 
 # # Red Hat subscription
+rhsm_register: False
+
 # # Using Red Hat Satellite:
 #rhsm_register: True
 #rhsm_satellite: 'sat-6.example.com'