Merge "Don't rotate passwords when updating plan"

tripleo_ansible/ansible_plugins/modules/tripleo_passwords_rotate.py

@@ -59,6 +59,10 @@ options:
         description:
             - Overcloud plan container name
         default: overcloud
+    rotate_passwords:
+        description: flag for rotate passwords or not
+        default: true
+        type: bool
     password_list:
         description:
             - Password list to be rotated
@@ -73,6 +77,7 @@ EXAMPLES = '''
 - name: Rotate passwords and update plan
   tripleo_password_rotate:
       container: overcloud
+      rotate_passwords: true
       password_list: []
 '''
 
@@ -119,6 +124,7 @@ def run_module():
 
     try:
         container = module.params.get('container')
+        rotate_passwords = module.params.get('rotate_passwords')
         password_list = module.params.get('password_list')
         _, conn = openstack_cloud_from_module(module)
         session = conn.session
@@ -134,7 +140,7 @@ def run_module():
         mistral = get_workflow_client(mistral_url, session)
         rotated_passwords = plan_utils.generate_passwords(
             swift, heat, mistral, container,
-            rotate_passwords=True,
+            rotate_passwords=rotate_passwords,
             rotate_pw_list=password_list)
         result['success'] = True
         result['passwords'] = rotated_passwords

tripleo_ansible/playbooks/cli-update-deployment-plan.yaml

@@ -59,9 +59,10 @@
 
       when: source_url is not none
 
-    - name: Generate passwords and update plan
+    - name: Generate passwords if does not exist and update plan
       tripleo_passwords_rotate:
         container: "{{ container }}"
+        rotate_passwords: false
       when: generate_passwords|bool
 
     - name: Prepare Container images and update plan