Skip to content

Commit 677f7f1

Browse files
[BACKPORT 2.5.3] [yugabyte#7475] Platform: Use more recent centos-7 base image for GCP universe VMs
Summary: - Initial diff to update CentOS image on GCP. - Also install rsync as it is not available in this image Original diffs: - yugabyte@5e38f6b - yugabyte@41b69bc Test Plan: Jenkins: rebase: 2.5.3 - Test universe creation on GCP, - Test universe creation on cloud provider different from GCP. - Test backup restore flow on GCP Reviewers: sanketh Reviewed By: sanketh Subscribers: jenkins-bot, yugaware Differential Revision: https://phabricator.dev.yugabyte.com/D10907
1 parent 43cd1ec commit 677f7f1

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

managed/devops/opscli/ybops/data/gcp-metadata.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,77 +11,77 @@ zone_cidr_format: "{}.{}.0/20"
1111
regions:
1212
us-central1:
1313
cidr_prefix: "10.200"
14-
image: centos-7-v20171213
14+
image: centos-7-v20210217
1515
project: centos-cloud
1616
zones: ['a', 'b', 'c', 'f']
1717
europe-west1:
1818
cidr_prefix: "10.201"
19-
image: centos-7-v20171213
19+
image: centos-7-v20210217
2020
project: centos-cloud
2121
zones: ['b', 'c', 'd']
2222
us-west1:
2323
cidr_prefix: "10.202"
24-
image: centos-7-v20171213
24+
image: centos-7-v20210217
2525
project: centos-cloud
2626
zones: ['a', 'b', 'c']
2727
asia-east1:
2828
cidr_prefix: "10.203"
29-
image: centos-7-v20171213
29+
image: centos-7-v20210217
3030
project: centos-cloud
3131
zones: ['a', 'b', 'c']
3232
us-east1:
3333
cidr_prefix: "10.204"
34-
image: centos-7-v20171213
34+
image: centos-7-v20210217
3535
project: centos-cloud
3636
zones: ['b', 'c', 'd']
3737
asia-northeast1:
3838
cidr_prefix: "10.205"
39-
image: centos-7-v20171213
39+
image: centos-7-v20210217
4040
project: centos-cloud
4141
zones: ['a', 'b', 'c']
4242
asia-southeast1:
4343
cidr_prefix: "10.206"
44-
image: centos-7-v20171213
44+
image: centos-7-v20210217
4545
project: centos-cloud
4646
zones: ['a', 'b', 'c']
4747
us-east4:
4848
cidr_prefix: "10.207"
49-
image: centos-7-v20171213
49+
image: centos-7-v20210217
5050
project: centos-cloud
5151
zones: ['a', 'b', 'c']
5252
australia-southeast1:
5353
cidr_prefix: "10.208"
54-
image: centos-7-v20171213
54+
image: centos-7-v20210217
5555
project: centos-cloud
5656
zones: ['a', 'b', 'c']
5757
europe-west2:
5858
cidr_prefix: "10.209"
59-
image: centos-7-v20171213
59+
image: centos-7-v20210217
6060
project: centos-cloud
6161
zones: ['a', 'b', 'c']
6262
europe-west3:
6363
cidr_prefix: "10.210"
64-
image: centos-7-v20171213
64+
image: centos-7-v20210217
6565
project: centos-cloud
6666
zones: ['a', 'b', 'c']
6767
southamerica-east1:
6868
cidr_prefix: "10.211"
69-
image: centos-7-v20171213
69+
image: centos-7-v20210217
7070
project: centos-cloud
7171
zones: ['a', 'b', 'c']
7272
asia-south1:
7373
cidr_prefix: "10.212"
74-
image: centos-7-v20171213
74+
image: centos-7-v20210217
7575
project: centos-cloud
7676
zones: ['a', 'b', 'c']
7777
northamerica-northeast1:
7878
cidr_prefix: "10.213"
79-
image: centos-7-v20171213
79+
image: centos-7-v20210217
8080
project: centos-cloud
8181
zones: ['a', 'b', 'c']
8282
europe-west4:
8383
cidr_prefix: "10.214"
84-
image: centos-7-v20171213
84+
image: centos-7-v20210217
8585
project: centos-cloud
8686
zones: ['a', 'b', 'c']
8787

managed/devops/roles/server_base/defaults/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ air_gap: false
1010
update_yum_cache: false
1111
yum_retry_count: 5
1212

13-
linux_packages: []
13+
linux_packages:
14+
- rsync
1415

1516
azure_packages:
1617
- libselinux-python

managed/devops/use_custom_ssh_port.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
# http://stackoverflow.com/questions/32429259/ansible-fails-with-bin-sh-1-usr-bin-python-not-found
1616
- name: 'install python 2.x'
1717
raw: if grep Ubuntu /etc/issue >/dev/null; then sudo apt-get -y install python; fi
18+
- name: Install policycoreutils-python
19+
package:
20+
name: policycoreutils-python
21+
state: present
22+
when: machine_image is match(".*centos-7-v20210217")
1823
roles:
1924
- ansible-sshd
2025
vars:

0 commit comments

Comments
 (0)