Updating samples

- remove the symlinks - update IPAM sample Signed-off-by: Fabricio Aguiar <[email protected]>
openstack-k8s-operators · Sep 11, 2023 · 7d2d79f · 7d2d79f
1 parent 02fbfd6
commit 7d2d79f
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 15 deletions.
diff --git a/config/samples/dataplane_v1beta1_openstackdataplane_baremetal_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplane_baremetal_with_ipam.yaml
diff --git a/config/samples/dataplane_v1beta1_openstackdataplane_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplane_with_ipam.yaml
diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml
@@ -28,7 +28,6 @@ spec:
          hostName: edpm-compute-0
          ansible:
            ansibleHost: 192.168.122.100
-           ansibleUser: root
            ansibleVars:
              ctlplane_ip: 192.168.122.100
              internal_api_ip: 172.17.0.100
@@ -37,7 +36,7 @@ spec:
              fqdn_internal_api: edpm-compute-0.example.com
     managementNetwork: ctlplane
     ansible:
-      ansibleUser: root
+      ansibleUser: cloud-admin
       ansiblePort: 22
       ansibleVars:
          service_net_map:

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml
@@ -3,7 +3,6 @@ kind: OpenStackDataPlaneNodeSet
 metadata:
   name: openstack-edpm-ipam
 spec:
-  ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret
   env:
     - name: ANSIBLE_FORCE_COLOR
       value: "True"
@@ -22,6 +21,7 @@ spec:
     - libvirt
     - nova
   nodeTemplate:
+    ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret
     nodes:
        edpm-compute-0:
          hostName: edpm-compute-0
@@ -88,9 +88,6 @@ spec:
          edpm_ovn_metadata_agent_metadata_agent_DEFAULT_nova_metadata_host: 127.0.0.1
          edpm_ovn_metadata_agent_metadata_agent_DEFAULT_metadata_proxy_shared_secret: 12345678
          edpm_ovn_metadata_agent_DEFAULT_bind_host: 127.0.0.1
-         ctlplane_dns_nameservers:
-         - 192.168.122.1
-         dns_search_domains: []
          edpm_ovn_dbs:
          - 192.168.122.1
          registry_url: quay.io/podified-antelope-centos9

diff --git a/docs/composable_services.md b/docs/composable_services.md
@@ -236,7 +236,7 @@ service to execute for the `edpm-compute` `NodeSet`.
             ansible:
               ansibleHost: 172.20.12.67
               ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret
-              ansibleUser: root
+              ansibleUser: cloud-admin
               ansibleVars:
                 ansible_ssh_transfer_method: scp
                 ctlplane_ip: 172.20.12.67

diff --git a/docs/inheritance.md b/docs/inheritance.md
@@ -31,7 +31,7 @@ spec:
         network: ctlplane
   nodeTemplate:
     ansiblePort: 22
-    ansibleUser: root
+    ansibleUser: cloud-admin
     managed: false
     managementNetwork: ctlplane
     networkConfig:
@@ -46,7 +46,7 @@ following from the `nodeTemplate` in node 1 and 2 above.
 
 ```yaml
     ansiblePort: 22
-    ansibleUser: root
+    ansibleUser: cloud-admin
     managed: false
     managementNetwork: ctlplane
     networkConfig:

diff --git a/tests/kuttl/tests/dataplane-create-test/00-assert.yaml b/tests/kuttl/tests/dataplane-create-test/00-assert.yaml
@@ -13,7 +13,7 @@ spec:
   nodeTemplate:
     ansible:
       ansiblePort: 22
-      ansibleUser: root
+      ansibleUser: cloud-admin
       ansibleVars:
         ctlplane_dns_nameservers:
         - 192.168.122.1
@@ -92,7 +92,7 @@ spec:
       edpm-compute-0:
         ansible:
           ansibleHost: 192.168.122.100
-          ansibleUser: root
+          ansibleUser: cloud-admin
           ansibleVars:
             ctlplane_ip: 192.168.122.100
             fqdn_internal_api: edpm-compute-0.example.com

diff --git a/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml
@@ -28,7 +28,7 @@ spec:
          hostName: edpm-compute-0
          ansible:
            ansibleHost: 192.168.122.100
-           ansibleUser: root
+           ansibleUser: cloud-admin
            ansibleVars:
              ctlplane_ip: 192.168.122.100
              internal_api_ip: 172.17.0.100
@@ -37,7 +37,7 @@ spec:
              fqdn_internal_api: edpm-compute-0.example.com
     managementNetwork: ctlplane
     ansible:
-      ansibleUser: root
+      ansibleUser: cloud-admin
       ansiblePort: 22
       ansibleVars:
          service_net_map: