Merge "Make the file name for user_secrets a variable"

scripts/upgrade-utilities/playbooks/defaults/main.yml

@@ -0,0 +1,15 @@
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+osa_secrets_file_name: user_secrets.yml

scripts/upgrade-utilities/playbooks/user-secrets-adjustment.yml

@@ -24,10 +24,10 @@
       register: secrets
     - name: Add missing secret
       shell: |
-        if ! grep '^{{ item }}' /etc/openstack_deploy/user_secrets.yml; then
-          echo {{ item }} | tee -a /etc/openstack_deploy/user_secrets.yml
+        if ! grep '^{{ item }}' /etc/openstack_deploy/{{ osa_secrets_file_name }}; then
+          echo {{ item }} | tee -a /etc/openstack_deploy/{{ osa_secrets_file_name }}
         fi
       with_items: secrets.stdout_lines
     - name: Generate new secrets
-      shell: "{{ playbook_dir }}/../../../scripts/pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml"
+      shell: "{{ playbook_dir }}/../../../scripts/pw-token-gen.py --file /etc/openstack_deploy/{{ osa_secrets_file_name }}"