openstack
/
openstack-ansible-os_barbican
Code Issues Proposed changes

Remove git_dest var and extras folder 

The barbican_git_dest variable is not used anywhere
and the extras folder is no longer necessary as
barbican is now implemented in the integrated
release.

Change-Id: I88437e1a07140c55d083a82f15f139d86284f716
This commit is contained in:
Jesse Pretorius 2017-03-14 09:11:03 +00:00
parent 60919e2944
commit 99b7e4af83
5 changed files with 0 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -72,7 +72,6 @@ barbican_developer_mode: false
## The git source/branch
barbican_git_repo: "https://git.openstack.org/openstack/barbican"
barbican_git_install_branch: master
barbican_git_dest: "/opt/barbican_{{ barbican_git_install_branch |replace('/', '_') }}"
## The packages to build from source (used in developer mode)
barbican_developer_constraints:

16
extras/env.d/barbican.yml
View File

@ -1,16 +0,0 @@
---
component_skel:
barbican_api:
belongs_to:
- barbican_all
container_skel:
barbican_container:
belongs_to:
- infra_containers
- os-infra_containers
contains:
- barbican_api
properties:
service_name: barbican
container_release: xenial

10
extras/haproxy_barbican.yml
View File

@ -1,10 +0,0 @@
- service:
haproxy_service_name: barbican
haproxy_backend_nodes: "{{ groups['barbican_all'] | default([]) }}"
haproxy_port: 9311
haproxy_balance_type: http
haproxy_balance_alg: leastconn
haproxy_backend_options:
- "forwardfor"
- "httpchk /status"
- "httplog"

185
extras/os-barbican-install.yml
View File

@ -1,185 +0,0 @@
---
# Copyright 2016, Ian Cordasco
# Copyright 2016, Rackspace
#
# 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.
- name: Install barbican server
hosts: barbican_all
max_fail_percentage: 20
user: root
pre_tasks:
- name: Use the lxc-openstack aa profile
lxc_container:
name: "{{ container_name }}"
container_config:
- "lxc.aa_profile=lxc-openstack"
delegate_to: "{{ physical_host }}"
when: not is_metal | bool
register: container_config
tags:
- lxc-aa-profile
- name: Wait for container ssh
wait_for:
port: "22"
delay: "{{ ssh_delay }}"
search_regex: "OpenSSH"
host: "{{ ansible_host }}"
delegate_to: "{{ physical_host }}"
when: >
(container_config is defined and container_config | changed) or
(container_extra_config is defined and container_config | changed)
register: ssh_wait_check
until: ssh_wait_check | success
retries: 3
tags:
- ssh-wait
- name: Sort the rabbitmq servers
dist_sort:
value_to_lookup: "{{ container_name }}"
ref_list: "{{ groups['barbican_all'] }}"
src_list: "{{ rabbitmq_servers }}"
register: servers
- name: Set rabbitmq servers
set_fact:
rabbitmq_servers: "{{ servers.sorted_list }}"
- name: Create log dir
file:
path: "{{ item.path }}"
state: directory
with_items:
- { path: "/openstack/log/{{ inventory_hostname }}-barbican" }
when: is_metal | bool
tags:
- barbican-logs
- barbican-log-dirs
- name: Create log aggregation links
file:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
state: "{{ item.state }}"
force: "yes"
with_items:
- { src: "/openstack/log/{{ inventory_hostname }}-barbican", dest: "/var/log/barbican", state: "link" }
when: is_metal | bool
tags:
- barbican-logs
- name: Ensure Rabbitmq vhost
rabbitmq_vhost:
name: "{{ barbican_rabbitmq_vhost }}"
state: "present"
delegate_to: "{{ groups['rabbitmq_all'][0] }}"
when:
- inventory_hostname == groups['barbican_all'][0]
- groups['rabbitmq_all']|length > 0
tags:
- barbican-rabbitmq
- barbican-rabbitmq-vhost
- name: Ensure rabbitmq user
rabbitmq_user:
user: "{{ barbican_rabbitmq_userid }}"
password: "{{ barbican_rabbitmq_password }}"
vhost: "{{ barbican_rabbitmq_vhost }}"
configure_priv: ".*"
read_priv: ".*"
write_priv: ".*"
state: "present"
delegate_to: "{{ groups['rabbitmq_all'][0] }}"
when:
- inventory_hostname == groups['barbican_all'][0]
- groups['rabbitmq_all']|length > 0
tags:
- barbican-rabbitmq
- barbican-rabbitmq-user
- name: Keystone create DB for service
mysql_db:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ galera_address }}"
name: "{{ barbican_galera_database }}"
state: "present"
when: inventory_hostname == groups['barbican_all'][0]
delegate_to: "{{ groups['galera_all'][0] }}"
tags:
- mysql-db-setup
- name: Keystone grant access to the DB for the service
mysql_user:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ galera_address }}"
name: "{{ barbican_galera_database }}"
password: "{{ barbican_galera_password }}"
host: "{{ item }}"
state: "present"
priv: "{{ barbican_galera_database }}.*:ALL"
with_items:
- "localhost"
- "%"
when: inventory_hostname == groups['barbican_all'][0]
delegate_to: "{{ groups['galera_all'][0] }}"
tags:
- mysql-db-setup
roles:
- role: "openstack-ansible-barbican"
barbican_galera_address: "{{ galera_address }}"
barbican_venv_tag: "{{ openstack_release }}"
barbican_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/barbican-{{ openstack_release }}.tgz"
barbican_config_overrides:
DEFAULT:
bind_host: "{{ barbican_service_host }}"
bind_port: "{{ barbican_service_port }}"
rpc_backend: "{{ barbican_rpc_backend }}"
host_href: "http://{{ barbican_rpc_backend }}:{{ barbican_service_port }}"
sql_connection: "mysql://{{ barbican_galera_user}}:{{ barbican_galera_password }}@{{ barbican_galera_address }}/{{ barbican_galera_database }}?charset=utf8"
rabbit_port: "{{ rabbitmq_port }}"
rabbit_hosts: "{{ rabbitmq_servers }}"
rabbit_userid: "{{ barbican_rabbitmq_userid }}"
rabbit_password: "{{ barbican_rabbitmq_password }}"
rabbit_virtual_host: "{{ barbican_rabbitmq_vhost }}"
rabbit_use_ssl: "{{ rabbitmq_use_ssl }}"
rabbit_notification_exchange: barbican
rabbit_notification_topic: notification
oslo_messaging_rabbit:
rabbit_hosts: "{{ rabbitmq_servers }}"
rabbit_port: "{{ rabbitmq_port }}"
rabbit_userid: "{{ barbican_rabbitmq_userid }}"
rabbit_password: "{{ barbican_rabbitmq_password }}"
rabbit_virtual_host: "{{ barbican_rabbitmq_vhost }}"
rabbit_use_ssl: "{{ rabbitmq_use_ssl }}"
rabbit_notification_exchange: barbican
rabbit_notification_topic: notification
identity:
uri: "{{ keystone_service_internaluri }}"
insecure: "{{ keystone_service_internaluri_insecure |bool }}"
version: v3
#auth_type: "{{ barbican_keystone_auth_plugin }}"
#auth_url: "{{ keystone_service_internaluri_v3 }}"
#auth_uri: "{{ keystone_service_internaluri_v3 }}"
project_domain_name: "{{ barbican_service_project_domain_name }}"
#user_domain_name: "{{ barbican_service_user_domain_name }}"
project_name: "{{ barbican_service_project_name }}"
domain_name: "{{ barbican_service_user_domain_name }}"
username: "{{ barbican_service_user_name }}"
password: "{{ barbican_service_password }}"
#memcached_servers: "{{ memcached_servers }}"
#token_cache_time: 300
tags:
- "os-barbican"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
- role: "system_crontab_coordination"
tags:
- "system-crontab-coordination"
vars:
galera_address: "{{ internal_lb_vip_address }}"
ansible_hostname: "{{ container_name }}"
is_metal: "{{ properties.is_metal|default(false) }}"

3
extras/user_secrets_barbican.yml
View File

@ -1,3 +0,0 @@
barbican_service_password:
barbican_galera_password:
barbican_rabbitmq_password: