Skip to content

Commit 71928ff

Browse files
committed
Update install_yaml_setup config
1 parent 834dd32 commit 71928ff

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

install_yamls_setup/roles/podified_cp/defaults/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ operators_git_repos:
1515
dest: ~/lib-common
1616
make_crc_cpus: 20
1717
make_crc_memory: 40000
18-
make_crc_disk: 70
18+
make_crc_disk: 120

install_yamls_setup/roles/podified_cp/tasks/main.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,25 +139,24 @@
139139
set +ex
140140
eval $(crc oc-env)
141141
oc login -u kubeadmin -p 12345678 https://api.crc.testing:6443
142-
NETWORK_ISOLATION=false make openstack 2>&1 | tee make_openstack.log
143-
sleep 10; NETWORK_ISOLATION=false make openstack_wait; sleep 10
144-
NETWORK_ISOLATION=false make openstack_deploy 2>&1 | tee make_openstack_deploy.log
145-
sleep 10; NETWORK_ISOLATION=false make openstack_wait_deploy; sleep 10
142+
make openstack 2>&1 | tee make_openstack.log
143+
sleep 10; make openstack_wait; sleep 10
144+
make openstack_deploy 2>&1 | tee make_openstack_deploy.log
145+
sleep 10; make openstack_wait_deploy; sleep 10
146146
147147
oc get csv -n openstack-operators octavia-operator.v0.0.1 -o json | \
148148
jq -r 'del(.metadata.generation, .metadata.resourceVersion, .metadata.uid)' > operator_csv.json
149149
sleep 10
150150
oc patch csv -n openstack-operators octavia-operator.v0.0.1 --type=json \
151151
-p="[{'op': 'remove', 'path': '/spec/webhookdefinitions'}]"
152152
153-
oc project openstack-operators
154-
oc patch openstackcontrolplane openstack-galera --type=merge --patch '
153+
oc project openstack
154+
oc patch openstackcontrolplane openstack-galera-network-isolation --type=merge --patch '
155155
spec:
156156
octavia:
157157
enabled: true
158158
'
159159
160-
161160
oc completion bash | sudo tee /etc/bash_completion.d/oc_completion
162161
openstack complete | sudo tee /etc/bash_completion.d/osc.bash_completion
163162
exit 0
@@ -232,5 +231,5 @@
232231
# cd ~/octavia-operator; ENABLE_WEBHOOKS=false GOWORK= OPERATOR_TEMPLATES=./templates make install run
233232
#
234233
# Deploy your PodSet Custom Resource to the live OpenShift Cluster:
235-
# oc create -f ~/octavia_v1beta1_octavia.yaml
234+
# oc apply -f ~/octavia_v1beta1_octavia.yaml
236235
# watch octavia pods get created using `oc get pods -w`

0 commit comments

Comments
 (0)