Merge branch 'master' into various-fixes
This commit is contained in:
commit
16d968e738
@ -48,7 +48,6 @@ def deploy():
|
|||||||
|
|
||||||
# RABBIT
|
# RABBIT
|
||||||
rabbitmq_service1 = vr.create('rabbitmq_service1', 'resources/rabbitmq_service/', {
|
rabbitmq_service1 = vr.create('rabbitmq_service1', 'resources/rabbitmq_service/', {
|
||||||
'node_name': 'rabbitmq_service1',
|
|
||||||
'management_port': 15672,
|
'management_port': 15672,
|
||||||
'port': 5672,
|
'port': 5672,
|
||||||
})[0]
|
})[0]
|
||||||
|
2
main.yml
2
main.yml
@ -14,7 +14,7 @@
|
|||||||
- apt: name=python-pudb state=present
|
- apt: name=python-pudb state=present
|
||||||
#- apt: name=python-pip state=present
|
#- apt: name=python-pip state=present
|
||||||
- shell: pip install docker-py==1.1.0
|
- shell: pip install docker-py==1.1.0
|
||||||
- shell: pip install python-keystoneclient==1.5.0
|
- apt: name=python-keystoneclient state=present
|
||||||
|
|
||||||
- apt: name=redis-server state=present
|
- apt: name=redis-server state=present
|
||||||
#- apt: name=python-redis state=present
|
#- apt: name=python-redis state=present
|
||||||
|
@ -2,6 +2,6 @@
|
|||||||
sudo: yes
|
sudo: yes
|
||||||
tasks:
|
tasks:
|
||||||
- name: install python-keystoneclient
|
- name: install python-keystoneclient
|
||||||
shell: pip install python-keystoneclient
|
shell: apt-get install python-keystoneclient
|
||||||
- name: keystone role
|
- name: keystone role
|
||||||
keystone_user: endpoint=http://{{keystone_host}}:{{keystone_port}}/v2.0/ token={{admin_token}} user={{user_name}} tenant={{tenant_name}} role={{role_name}} state=present
|
keystone_user: endpoint=http://{{keystone_host}}:{{keystone_port}}/v2.0/ token={{admin_token}} user={{user_name}} tenant={{tenant_name}} role={{role_name}} state=present
|
||||||
|
@ -2,6 +2,6 @@
|
|||||||
sudo: yes
|
sudo: yes
|
||||||
tasks:
|
tasks:
|
||||||
- name: install python-keystoneclient
|
- name: install python-keystoneclient
|
||||||
shell: pip install python-keystoneclient
|
shell: apt-get install python-keystoneclient
|
||||||
- name: keystone tenant
|
- name: keystone tenant
|
||||||
keystone_user: endpoint=http://{{keystone_host}}:{{keystone_port}}/v2.0/ token={{admin_token}} tenant={{tenant_name}} state=present
|
keystone_user: endpoint=http://{{keystone_host}}:{{keystone_port}}/v2.0/ token={{admin_token}} tenant={{tenant_name}} state=present
|
||||||
|
@ -2,6 +2,6 @@
|
|||||||
sudo: yes
|
sudo: yes
|
||||||
tasks:
|
tasks:
|
||||||
- name: install python-keystoneclient
|
- name: install python-keystoneclient
|
||||||
shell: pip install python-keystoneclient
|
shell: apt-get install python-keystoneclient
|
||||||
- name: keystone user
|
- name: keystone user
|
||||||
keystone_user: endpoint=http://{{ keystone_host }}:{{ keystone_port }}/v2.0/ token={{ admin_token }} user={{ user_name }} password={{ user_password }} tenant={{ tenant_name }} state=present
|
keystone_user: endpoint=http://{{ keystone_host }}:{{ keystone_port }}/v2.0/ token={{ admin_token }} user={{ user_name }} password={{ user_password }} tenant={{ tenant_name }} state=present
|
||||||
|
@ -5,12 +5,8 @@ $management_port = "${resource['input']['management_port']['value']}"
|
|||||||
$node_name = $resource['input']['node_name']['value']
|
$node_name = $resource['input']['node_name']['value']
|
||||||
|
|
||||||
class { '::rabbitmq':
|
class { '::rabbitmq':
|
||||||
service_manage => false,
|
service_manage => true,
|
||||||
port => $port,
|
port => $port,
|
||||||
management_port => $management_port,
|
management_port => $management_port,
|
||||||
delete_guest_user => true,
|
delete_guest_user => true,
|
||||||
environment_variables => {
|
|
||||||
'RABBITMQ_NODENAME' => $node_name,
|
|
||||||
'RABBITMQ_SERVICENAME' => 'RabbitMQ'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -4,4 +4,3 @@
|
|||||||
- new_rabbitmq_user: user={{user_name}}
|
- new_rabbitmq_user: user={{user_name}}
|
||||||
vhost={{vhost_name}}
|
vhost={{vhost_name}}
|
||||||
state=absent
|
state=absent
|
||||||
node={{node_name}}
|
|
||||||
|
@ -8,4 +8,3 @@
|
|||||||
read_priv=.*
|
read_priv=.*
|
||||||
write_priv=.*
|
write_priv=.*
|
||||||
state=present
|
state=present
|
||||||
node={{node_name}}
|
|
||||||
|
@ -2,9 +2,6 @@ id: rabbitmq_user
|
|||||||
handler: ansible
|
handler: ansible
|
||||||
version: 1.0.0
|
version: 1.0.0
|
||||||
input:
|
input:
|
||||||
node_name:
|
|
||||||
schema: str!
|
|
||||||
value:
|
|
||||||
user_name:
|
user_name:
|
||||||
schema: str!
|
schema: str!
|
||||||
value: openstack
|
value: openstack
|
||||||
|
@ -3,4 +3,3 @@
|
|||||||
tasks:
|
tasks:
|
||||||
- new_rabbitmq_vhost: name={{vhost_name}}
|
- new_rabbitmq_vhost: name={{vhost_name}}
|
||||||
state=absent
|
state=absent
|
||||||
node={{node_name}}
|
|
||||||
|
@ -2,5 +2,4 @@
|
|||||||
sudo: yes
|
sudo: yes
|
||||||
tasks:
|
tasks:
|
||||||
- new_rabbitmq_vhost: name={{vhost_name}}
|
- new_rabbitmq_vhost: name={{vhost_name}}
|
||||||
node={{node_name}}
|
|
||||||
state=present
|
state=present
|
||||||
|
@ -2,9 +2,6 @@ id: rabbitmq_vhost
|
|||||||
handler: ansible
|
handler: ansible
|
||||||
version: 1.0.0
|
version: 1.0.0
|
||||||
input:
|
input:
|
||||||
node_name:
|
|
||||||
schema: str!
|
|
||||||
value:
|
|
||||||
vhost_name:
|
vhost_name:
|
||||||
schema: str!
|
schema: str!
|
||||||
value: openstack
|
value: openstack
|
||||||
|
Loading…
x
Reference in New Issue
Block a user