Merge pull request #81 from rabi/ansible_vars

Align vars with dataplane changes
openstack-k8s-operators · Jan 26, 2024 · b18ae4a · b18ae4a
2 parents 7354503 + 5a8b7d6
commit b18ae4a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/examples/va/hci/edpm-post-ceph/openstackdataplanenodeset.yaml b/examples/va/hci/edpm-post-ceph/openstackdataplanenodeset.yaml
@@ -43,7 +43,7 @@ spec:
             dns_servers: {{ ctlplane_dns_nameservers }}
             domain: {{ dns_search_domains }}
             addresses:
-            - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
+            - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
             routes: {{ ctlplane_host_routes }}
             members:
             - type: interface
@@ -77,8 +77,8 @@ spec:
         neutron_public_interface_name: eth0
         registry_url: quay.io/podified-antelope-centos9
         service_net_map:
-          nova_api_network: internal_api
-          nova_libvirt_network: internal_api
+          nova_api_network: internalapi
+          nova_libvirt_network: internalapi
         edpm_ceph_hci_pre_enabled_services:
           - ceph_mon
           - ceph_mgr

diff --git a/examples/va/hci/edpm-pre-ceph/openstackdataplanenodeset.yaml b/examples/va/hci/edpm-pre-ceph/openstackdataplanenodeset.yaml
@@ -59,7 +59,7 @@ spec:
             dns_servers: {{ ctlplane_dns_nameservers }}
             domain: {{ dns_search_domains }}
             addresses:
-            - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
+            - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
             routes: {{ ctlplane_host_routes }}
             members:
             - type: interface
@@ -93,8 +93,8 @@ spec:
         neutron_public_interface_name: eth0
         registry_url: quay.io/podified-antelope-centos9
         service_net_map:
-          nova_api_network: internal_api
-          nova_libvirt_network: internal_api
+          nova_api_network: internalapi
+          nova_libvirt_network: internalapi
         edpm_ceph_hci_pre_enabled_services:
           - ceph_mon
           - ceph_mgr

diff --git a/examples/va/nfv/sriov/edpm/values.yaml b/examples/va/nfv/sriov/edpm/values.yaml
@@ -23,8 +23,8 @@ data:
         #       subscription-manager register --username <subscription_manager_username> --password <subscription_manager_password>
         #       podman login -u <registry_username> -p <registry_password> registry.redhat.io
         service_net_map:
-          nova_api_network: internal_api
-          nova_libvirt_network: internal_api
+          nova_api_network: internalapi
+          nova_libvirt_network: internalapi
         timesync_ntp_servers:
           - hostname: clock.redhat.com
         # CPU pinning settings
@@ -49,7 +49,7 @@ data:
             dns_servers: {{ ctlplane_dns_nameservers }}
             domain: {{ dns_search_domains }}
             addresses:
-            - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
+            - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
             routes: {{ ctlplane_host_routes }}
             members:
             - type: interface