Skip to content

Commit 062d906

Browse files
authored
systemvm template download change (#212)
Related apache/cloudstack#11656 --------- Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent 2822bbc commit 062d906

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

Ansible/roles/cloudstack-config/tasks/ssljetty.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- { regexpression: "^https.keystore=.*$", newline: "https.keystore=/etc/cloudstack/management/keystore.pkcs12" }
1616
- { regexpression: "^https.keystore.password=.*$", newline: "https.keystore.password={{ ssl_keystore_password }}" }
1717
- { regexpression: "^https.port=.*$", newline: "https.port={{ ssl_port }}" }
18+
- { regexpression: "^#\\s*system.vm.templates.download.repository=.*$", newline: "system.vm.templates.download.repository=http://{{ stagingserverip }}/systemvmtemplate/" }
1819

1920
- name: restart mgmt service
2021
service: name=cloudstack-management state=restarted

Ansible/roles/cloudstack-manager/tasks/setup-mgmt.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,31 @@
88
tags:
99
- setup_mgmt
1010

11+
- name: systemvm template hypervisors
12+
set_fact:
13+
num_esxi_hosts: "{{ groups['esxi_hosts'] | length }}"
14+
num_kvm_hosts: "{{ groups['kvm_hosts'] | length }}"
15+
num_xen_hosts: "{{ groups['xenserver_hosts'] | length }}"
16+
systemvm_templates_list: "{{
17+
[]
18+
| union(['kvm-x86_64'] if (num_kvm_hosts | int) > 0 else [])
19+
| union(['vmware'] if (num_esxi_hosts | int) > 0 else [])
20+
| union(['xenserver'] if (num_xen_hosts | int) > 0 else [])
21+
}}"
22+
systemvm_templates_hypervisor_arg: "{{ ('--systemvm-templates ' ~ (systemvm_templates_list | join(',')))
23+
if ((systemvm_templates_list | length) > 0 and (env_numversion | version_compare('4.23','>='))) else '' }}"
24+
25+
- name: systemvm template repository
26+
set_fact:
27+
systemvm_templates_repository_arg: "{{ ('--systemvm-templates-repository http://' ~ stagingserverip ~ '/systemvmtemplate/')
28+
if (env_numversion | version_compare('4.23','>=')) else '' }}"
29+
30+
1131
- debug:
1232
msg: "cloudstack not cloud is {{ path_is_cloudstack.stat.exists }} and the OS version is {{ ansible_distribution_major_version }}"
1333

1434
- name: Setup CloudStack Manager (centos/rhel8+/suse/ubuntu/debian or centos/rhel7 ACS < 4.6)
15-
shell: sleep {{ play_hosts.index(inventory_hostname) | int * 15 }} && /usr/bin/cloudstack-setup-management
35+
shell: sleep {{ play_hosts.index(inventory_hostname) | int * 15 }} && /usr/bin/cloudstack-setup-management {{ systemvm_templates_hypervisor_arg }} {{ systemvm_templates_repository_arg }}
1636
when: >
1737
((ansible_distribution_major_version|int == 6) and (path_is_cloudstack.stat.exists|bool == True)) or
1838
((ansible_distribution_major_version == "7") and (env_numversion | version_compare('4.6','<'))) or

0 commit comments

Comments
 (0)