Skip to content

Commit

Permalink
[BACKPORT 2.4] [Platform] Use more recent centos-7 base image for GCP…
Browse files Browse the repository at this point in the history
… universe VMs #7475

Summary:
  - Initial diff to update CentOS image on GCP.
  - Also install rsync as it is not available in this image

Original diffs:
-  5e38f6b
-  41b69bc

Test Plan:
- Test universe creation on GCP,
- Test universe creation on cloud provider different from GCP.
- Test backup restore flow on GCP

Reviewers: dskorobogaty, spotachev, wesley

Reviewed By: wesley

Subscribers: jenkins-bot, yugaware

Differential Revision: https://phabricator.dev.yugabyte.com/D10860
  • Loading branch information
SergeyPotachev authored and iSignal committed Mar 10, 2021
1 parent 04f38b1 commit 17e9c64
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 16 deletions.
30 changes: 15 additions & 15 deletions managed/devops/opscli/ybops/data/gcp-metadata.yml
Expand Up @@ -11,77 +11,77 @@ zone_cidr_format: "{}.{}.0/20"
regions:
us-central1:
cidr_prefix: "10.200"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c', 'f']
europe-west1:
cidr_prefix: "10.201"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['b', 'c', 'd']
us-west1:
cidr_prefix: "10.202"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
asia-east1:
cidr_prefix: "10.203"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
us-east1:
cidr_prefix: "10.204"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['b', 'c', 'd']
asia-northeast1:
cidr_prefix: "10.205"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
asia-southeast1:
cidr_prefix: "10.206"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
us-east4:
cidr_prefix: "10.207"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
australia-southeast1:
cidr_prefix: "10.208"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
europe-west2:
cidr_prefix: "10.209"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
europe-west3:
cidr_prefix: "10.210"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
southamerica-east1:
cidr_prefix: "10.211"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
asia-south1:
cidr_prefix: "10.212"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
northamerica-northeast1:
cidr_prefix: "10.213"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']
europe-west4:
cidr_prefix: "10.214"
image: centos-7-v20171213
image: centos-7-v20210217
project: centos-cloud
zones: ['a', 'b', 'c']

Expand Down
3 changes: 2 additions & 1 deletion managed/devops/roles/server_base/defaults/main.yml
Expand Up @@ -10,7 +10,8 @@ air_gap: false
update_yum_cache: false
yum_retry_count: 5

linux_packages: []
linux_packages:
- rsync

azure_packages:
- libselinux-python
5 changes: 5 additions & 0 deletions managed/devops/use_custom_ssh_port.yml
Expand Up @@ -15,6 +15,11 @@
# http://stackoverflow.com/questions/32429259/ansible-fails-with-bin-sh-1-usr-bin-python-not-found
- name: 'install python 2.x'
raw: if grep Ubuntu /etc/issue >/dev/null; then sudo apt-get -y install python; fi
- name: Install policycoreutils-python
package:
name: policycoreutils-python
state: present
when: machine_image is match(".*centos-7-v20210217")
roles:
- ansible-sshd
vars:
Expand Down

0 comments on commit 17e9c64

Please sign in to comment.