Fix issues with Keystone token adjustment playbook

+ Ignore fernet keys in .gitignore
+ Ansible throws up now on an integer
+ Fernet keys belong in the fernet-keys directory (I think this
  was a copy and paste error that was never patched.)

Change-Id: Ie6805a8852d638f4a2597d976815d749c41cfc06
This commit is contained in:
Alex Krzos 2016-06-23 08:51:28 -04:00
parent eaffe24801
commit 494685033e
2 changed files with 10 additions and 7 deletions

3
.gitignore vendored
View File

@ -6,6 +6,9 @@
# Prevent hosts files from sneaking into the git repo # Prevent hosts files from sneaking into the git repo
ansible/hosts ansible/hosts
# Prevent any fernet keys from sneaking into git repo
ansible/browbeat/roles/keystone-token/files/[0-9]
log/* log/*
# Swap files # Swap files

View File

@ -70,22 +70,22 @@
- name: Setup fernet keys - name: Setup fernet keys
command: keystone-manage fernet_setup --keystone-user keystone --keystone-group keystone command: keystone-manage fernet_setup --keystone-user keystone --keystone-group keystone
when: ("'{{ token_provider }}' == 'fernet'") and (inventory_hostname == groups['controller'][0]) when: ("'{{ token_provider }}' == 'fernet'") and (inventory_hostname == groups['controller'][0])
- name: Get fernet keys - name: Get fernet keys
fetch: src=/etc/keystone/fernet-keys/{{ item }} dest=roles/keystone-token/files/{{ item }} flat=yes fetch: src=/etc/keystone/fernet-keys/{{ item }} dest=roles/keystone-token/files/{{ item }} flat=yes
with_items: with_items:
- 0 - 0
- 1 - 1
when: ('{{ token_provider }}' == 'fernet') and (inventory_hostname == groups['controller'][0]) when: ('{{ token_provider }}' == 'fernet') and (inventory_hostname == groups['controller'][0])
changed_when: false changed_when: false
- name: Copy fernet keys - name: Copy fernet keys
copy: src={{ item }} dest=/etc/yum.repos.d/ copy: src={{ item }} dest=/etc/keystone/fernet-keys/{{ item }}
with_items: with_items:
- 0 - "0"
- 1 - "1"
when: ("'{{ token_provider }}' == 'fernet'") and (inventory_hostname != groups['controller'][0]) when: ("'{{ token_provider }}' == 'fernet'") and (inventory_hostname != groups['controller'][0])
- name: Copy keystone type enforcement file - name: Copy keystone type enforcement file
copy: copy:
@ -102,5 +102,5 @@
when: "'{{ token_provider }}' == 'fernet'" when: "'{{ token_provider }}' == 'fernet'"
- name: Install keystone selinux policy - name: Install keystone selinux policy
shell: semodule -i /root/my-keystone.pp shell: semodule -i /root/my-keystone.pp
when: "'{{ token_provider }}' == 'fernet'" when: "'{{ token_provider }}' == 'fernet'"