Skip to content

Commit 2bdd974

Browse files
abh1sarabh1sar
authored
Merge branch '4.19' into 419-changescope
2 parents afd107b + ae4b6d3 commit 2bdd974

6 files changed

Lines changed: 49 additions & 3 deletions

File tree

‎plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@ write_files:
3636
exit 0
3737
fi
3838
39+
sysctl net.ipv4.conf.default.arp_announce=0
40+
sysctl net.ipv4.conf.default.arp_ignore=0
41+
sysctl net.ipv4.conf.all.arp_announce=0
42+
sysctl net.ipv4.conf.all.arp_ignore=0
43+
sysctl net.ipv4.conf.eth0.arp_announce=0
44+
sysctl net.ipv4.conf.eth0.arp_ignore=0
45+
sed -i "s/net.ipv4.conf.default.arp_announce =.*$/net.ipv4.conf.default.arp_announce = 0/" /etc/sysctl.conf
46+
sed -i "s/net.ipv4.conf.default.arp_ignore =.*$/net.ipv4.conf.default.arp_ignore = 0/" /etc/sysctl.conf
47+
sed -i "s/net.ipv4.conf.all.arp_announce =.*$/net.ipv4.conf.all.arp_announce = 0/" /etc/sysctl.conf
48+
sed -i "s/net.ipv4.conf.all.arp_ignore =.*$/net.ipv4.conf.all.arp_ignore = 0/" /etc/sysctl.conf
49+
3950
ISO_MOUNT_DIR=/mnt/k8sdisk
4051
BINARIES_DIR=${ISO_MOUNT_DIR}/
4152
K8S_CONFIG_SCRIPTS_COPY_DIR=/tmp/k8sconfigscripts/

‎plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,17 @@ write_files:
5656
exit 0
5757
fi
5858
59+
sysctl net.ipv4.conf.default.arp_announce=0
60+
sysctl net.ipv4.conf.default.arp_ignore=0
61+
sysctl net.ipv4.conf.all.arp_announce=0
62+
sysctl net.ipv4.conf.all.arp_ignore=0
63+
sysctl net.ipv4.conf.eth0.arp_announce=0
64+
sysctl net.ipv4.conf.eth0.arp_ignore=0
65+
sed -i "s/net.ipv4.conf.default.arp_announce =.*$/net.ipv4.conf.default.arp_announce = 0/" /etc/sysctl.conf
66+
sed -i "s/net.ipv4.conf.default.arp_ignore =.*$/net.ipv4.conf.default.arp_ignore = 0/" /etc/sysctl.conf
67+
sed -i "s/net.ipv4.conf.all.arp_announce =.*$/net.ipv4.conf.all.arp_announce = 0/" /etc/sysctl.conf
68+
sed -i "s/net.ipv4.conf.all.arp_ignore =.*$/net.ipv4.conf.all.arp_ignore = 0/" /etc/sysctl.conf
69+
5970
ISO_MOUNT_DIR=/mnt/k8sdisk
6071
BINARIES_DIR=${ISO_MOUNT_DIR}/
6172
K8S_CONFIG_SCRIPTS_COPY_DIR=/tmp/k8sconfigscripts/

‎plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@ write_files:
3636
exit 0
3737
fi
3838
39+
sysctl net.ipv4.conf.default.arp_announce=0
40+
sysctl net.ipv4.conf.default.arp_ignore=0
41+
sysctl net.ipv4.conf.all.arp_announce=0
42+
sysctl net.ipv4.conf.all.arp_ignore=0
43+
sysctl net.ipv4.conf.eth0.arp_announce=0
44+
sysctl net.ipv4.conf.eth0.arp_ignore=0
45+
sed -i "s/net.ipv4.conf.default.arp_announce =.*$/net.ipv4.conf.default.arp_announce = 0/" /etc/sysctl.conf
46+
sed -i "s/net.ipv4.conf.default.arp_ignore =.*$/net.ipv4.conf.default.arp_ignore = 0/" /etc/sysctl.conf
47+
sed -i "s/net.ipv4.conf.all.arp_announce =.*$/net.ipv4.conf.all.arp_announce = 0/" /etc/sysctl.conf
48+
sed -i "s/net.ipv4.conf.all.arp_ignore =.*$/net.ipv4.conf.all.arp_ignore = 0/" /etc/sysctl.conf
49+
3950
ISO_MOUNT_DIR=/mnt/k8sdisk
4051
BINARIES_DIR=${ISO_MOUNT_DIR}/
4152
K8S_CONFIG_SCRIPTS_COPY_DIR=/tmp/k8sconfigscripts/

‎server/src/main/java/com/cloud/api/query/QueryManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4408,7 +4408,7 @@ private Pair<List<TemplateJoinVO>, Integer> searchForTemplatesInternal(ListTempl
44084408
Account caller = CallContext.current().getCallingAccount();
44094409
Long parentTemplateId = cmd.getParentTemplateId();
44104410

4411-
boolean listAll = false;
4411+
boolean listAll = cmd.listAll();
44124412
if (templateFilter != null && templateFilter == TemplateFilter.all) {
44134413
if (caller.getType() == Account.Type.NORMAL) {
44144414
throw new InvalidParameterValueException("Filter " + TemplateFilter.all + " can be specified by admin only");

‎ui/src/views/compute/DeployVM.vue‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2276,11 +2276,16 @@ export default {
22762276
}
22772277
args.zoneid = _.get(this.zone, 'id')
22782278
args.templatefilter = templateFilter
2279-
args.projectid = -1
2279+
if (this.$store.getters.project?.id) {
2280+
args.projectid = this.$store.getters.project.id
2281+
} else {
2282+
args.projectid = -1
2283+
}
22802284
args.details = 'all'
22812285
args.showicon = 'true'
22822286
args.id = this.templateId
22832287
args.isvnf = false
2288+
args.listall = true
22842289
22852290
return new Promise((resolve, reject) => {
22862291
api('listTemplates', args).then((response) => {
@@ -2299,10 +2304,15 @@ export default {
22992304
}
23002305
args.zoneid = _.get(this.zone, 'id')
23012306
args.isoFilter = isoFilter
2302-
args.projectid = -1
2307+
if (this.$store.getters.project?.id) {
2308+
args.projectid = this.$store.getters.project.id
2309+
} else {
2310+
args.projectid = -1
2311+
}
23032312
args.bootable = true
23042313
args.showicon = 'true'
23052314
args.id = this.isoId
2315+
args.listall = true
23062316
23072317
return new Promise((resolve, reject) => {
23082318
api('listIsos', args).then((response) => {

‎ui/src/views/compute/wizard/TemplateIsoRadioGroup.vue‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@
4646
:os-name="item.osName" />
4747
&nbsp;
4848
{{ item.displaytext }}
49+
<span v-if="item?.projectid">
50+
| <project-outlined /> {{ item.project }}
51+
</span>
4952
</a-radio>
5053
</a-radio-group>
5154
</a-list-item>

0 commit comments

Comments
 (0)