Do not generate octavia certs on gateway node
Octavia certs will be created on salt master node, so some steps
are no longer needed.
Change-Id: I5f8c8ffe34415a97bfcf6367899793086b489378
Related-PROD: PROD-25309
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index dea0366..773a1ee 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -56,13 +56,6 @@
sleep(5)
salt.enforceState(master, "I@linux:system ${extra_tgt}", ['linux', 'openssh', 'ntp', 'rsyslog'])
- if (salt.testTarget(master, "I@octavia:manager ${extra_tgt}")) {
- salt.enforceState(master, "I@octavia:manager ${extra_tgt}", 'salt.minion.ca')
-
- common.retry(3, 5) {
- salt.enforceState(master, "I@octavia:manager ${extra_tgt}", 'salt.minion.cert')
- }
- }
salt.enforceState(master, "* ${extra_tgt}", ['salt.minion'], true, false, null, false, 60, 2)
@@ -489,10 +482,6 @@
if (salt.testTarget(master, "I@octavia:manager ${extra_tgt}")) {
salt.runSaltProcessStep(master, "I@neutron:client ${extra_tgt}", 'mine.update')
salt.enforceState(master, "I@octavia:manager ${extra_tgt}", 'octavia.manager')
- salt.enforceState(master, "I@octavia:manager ${extra_tgt}", 'salt.minion.ca')
- common.retry(2, 5) {
- salt.enforceState(master, "I@octavia:manager ${extra_tgt}", 'salt.minion.cert')
- }
salt.enforceState(master, "I@octavia:client ${extra_tgt}", 'octavia.client')
}
}