From bceb1e15e61af8f996831f54477e840d123522f8 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Fri, 9 Sep 2016 12:12:37 -0500 Subject: [PATCH] Make the file name for user_secrets a variable Some downstream vendors may not have their secrets files in the location openstack-ansible expects. Here we allow them to set a variable for the filename where they are storing secrets within. Fixes-Bug: 1621938 Depends-On: I6578502ede4132f6764c3a77208505a28d1ba247 Change-Id: I1ccb908f8048cea54e2c2a1c2af20e6c976072b9 --- .../upgrade-utilities/playbooks/defaults/main.yml | 15 +++++++++++++++ .../playbooks/user-secrets-adjustment.yml | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 scripts/upgrade-utilities/playbooks/defaults/main.yml diff --git a/scripts/upgrade-utilities/playbooks/defaults/main.yml b/scripts/upgrade-utilities/playbooks/defaults/main.yml new file mode 100644 index 0000000000..7e6e862bd8 --- /dev/null +++ b/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 diff --git a/scripts/upgrade-utilities/playbooks/user-secrets-adjustment.yml b/scripts/upgrade-utilities/playbooks/user-secrets-adjustment.yml index 77cc58b013..5cc70b6cb0 100644 --- a/scripts/upgrade-utilities/playbooks/user-secrets-adjustment.yml +++ b/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 }}"