Updated support for rhsm builds of rhosp17 on rhel9

example-overrides/local-overrides-osp17-0.yaml

@@ -0,0 +1,67 @@
+# Override default variables by putting them in this file
+standalone_host: 192.168.124.131
+public_api: 192.168.124.131
+rhos_release: 17.0
+hostname: rhos-17
+clouddomain: home.lan
+local_cloudname: rhos-17
+openshift_password: openshift
+ceph_devices:
+ - /dev/sda
+rhsm_release: 9.0
+rhsm_repos:
+ - rhel-9-for-x86_64-baseos-eus-rpms
+ - rhel-9-for-x86_64-appstream-eus-rpms
+ - rhel-9-for-x86_64-highavailability-eus-rpms
+ - openstack-17-for-rhel-9-x86_64-rpms
+ - fast-datapath-for-rhel-9-x86_64-rpms
+ - rhceph-5-tools-for-rhel-9-x86_64-rpms
+rhsm_enabled: true
+# Get your organization ID and create your activation key at:
+# https://console.redhat.com/settings/connector/activation-keys
+rhsm_org_id: replace-with-numeric-org-id
+rhsm_activation_key: replace-with-org-activation-key
+
+# rhcs5 installation doesnt seem to play well with redhat registry service accounts
+# due to the mandatory pipe character in the username it issues.
+#
+# the workaround is to configure root podman directly at the url below
+#
+# https://access.redhat.com/terms-based-registry/#/accounts
+#
+# You can also create service accounts for redhat_registry_credentials here as well
+registry_auth_file: "/home/greg/dev-install/config.json"
+
+redhat_registry_credentials:
+ 'numeric-org-id|service-account-name': 'long-password-data-string'
+
+cip_config:
+ - set:
+ ceph_alertmanager_image: ose-prometheus-alertmanager
+ ceph_alertmanager_namespace: registry.redhat.io/openshift4
+ ceph_alertmanager_tag: 4.6
+ ceph_grafana_image: rhceph-5-dashboard-rhel8
+ ceph_grafana_namespace: registry.redhat.io/rhceph
+ ceph_grafana_tag: latest
+ ceph_image: rhceph-5-rhel8
+ ceph_namespace: registry.redhat.io/rhceph
+ ceph_node_exporter_image: ose-prometheus-node-exporter
+ ceph_node_exporter_namespace: registry.redhat.io/openshift4
+ ceph_node_exporter_tag: v4.6
+ ceph_prometheus_image: ose-prometheus
+ ceph_prometheus_namespace: registry.redhat.io/openshift4
+ ceph_prometheus_tag: 4.6
+ ceph_tag: latest
+ name_prefix: openstack-
+ name_suffix: ''
+ namespace: registry.redhat.io/rhosp-rhel9
+ neutron_driver: ovn
+ rhel_containers: false
+ tag: '17.0'
+ tag_from_label: '{version}-{release}'
+
+
+# fix for the following bug:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1498621
+extra_heat_params:
+ NovaComputeStartupDelay: 0

playbooks/install_stack.yaml

@@ -380,6 +380,33 @@
  cip_content:
  parameter_defaults:
  ContainerImagePrepare: "{{ cip_config }}"
+ ContainerImageRegistryLogin: true
+
+ # Red Hat Service Accounts have fixed usernames that incorporate a pipe character
+ # there is a lot of work required to handle this vs. a straight username because of to_nice_yaml
+ # when the rhcs5 portion of the build is started.
+ #
+ # Therefore it is easier to use the config.json method for podman.
+ - name: Setup Docker registry authentication
+ when: cip_config is defined
+ block:
+ - name: Ensure the .docker directory exists
+ file:
+ path: "/root/.docker"
+ state: directory
+ mode: '0755'
+ owner: "root"
+ group: "root"
+
+ - name: Copy config.json to remote host
+ copy:
+ src: "{{ registry_auth_file }}"
+ dest: "/root/.docker/config.json"
+ owner: "root"
+ group: "root"
+ mode: '0644'
+ become: true
+ become_user: root
 
  - name: Download containers-prepare-parameters.yaml from upstream master if cip_config is not defined on CentOS
  when:

playbooks/network.yaml

@@ -113,7 +113,7 @@
  stdin: "{{ network_state | to_nice_json }}"
  vars:
  network_state:
- interfaces: "{{ nmstate_ifs }}"
+ interfaces: "{{ nmstate_ifs | from_yaml }}"
  # add saved static routes
  routes:
  config: "{{ nmstate_routes }}"
@@ -125,11 +125,11 @@
  ansible.builtin.set_fact:
  checkpoint: "{{ (nmstateset.stdout_lines | last).split()[1] }}"
 
- - name: Set fact for nmstate checkpoing on RHEL9
+ - name: Set fact for nmstate checkpoint on RHEL9
  when:
  - ansible_facts.distribution_major_version == "9"
  ansible.builtin.set_fact:
- checkpoint: "{{ (nmstateset.stderr_lines | last).split()[-1] }}"
+ checkpoint: "{{ (nmstateset.stdout_lines | select('search', 'Checkpoint: NetworkManager\\|') | last).split()[1] }}"
 
  - name: Fail if the checkpoint has not been found or is incorrect
  when:

playbooks/prepare_host.yaml

@@ -37,14 +37,19 @@
  - name: Configure Red Hat Subscription Manager
  ansible.builtin.import_role:
  name: redhat-subscription
+ # this needs to be done early
+ - name: set rhsm_release
+ shell: subscription-manager release --set={{rhsm_release}}
  - name: Install container-tools module # noqa no-changed-when
  ansible.builtin.shell: |
  dnf module disable -y container-tools:rhel8
  dnf module enable -y container-tools:"{{ rhsm_container_tools_version }}"
+ when: rhsm_release | float < 9.0
  - name: Install virt module # noqa no-changed-when
  ansible.builtin.shell: |
  dnf module disable -y virt:rhel
  dnf module enable -y virt:"{{ virt_release }}"
+ when: rhsm_release | float < 9.0
 
  - name: Prepare host on RHEL system with rhos-release
  when: