Skip to content
Snippets Groups Projects
Commit 80b7266e authored by SamYaple's avatar SamYaple Committed by Sam Yaple
Browse files

Rename kolla_ansible to kolla_toolbox

This change is needed for clarity. We have a kolla-ansible script.
We have a kolla-mesos repo. We plan to have a kolla-ansible repo.
Already we have had far too much confusion about whether we are
talking about the container or the project. Naming this kolla-toolbox
eliminates all of that confusion and its probably a bit more accurate
of a name too.

Closes-Bug: #1541053
Change-Id: I8fd1f49d5a22b36ede5b10f46b9fe02ddda9007e
parent 1057dcd5
No related branches found
No related tags found
No related merge requests found
Showing
with 37 additions and 37 deletions
---
- name: Looking up disks to bootstrap for Ceph
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m find_disks
-a "partition_name='KOLLA_CEPH_OSD_BOOTSTRAP'"
register: osd_lookup
......@@ -12,7 +12,7 @@
osds_bootstrap: "{{ (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).disks|from_json }}"
- name: Looking up disks to bootstrap for Ceph
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m find_disks
-a "partition_name='KOLLA_CEPH_OSD_CACHE_BOOTSTRAP'"
register: osd_cache_lookup
......
---
- name: Looking up OSDs for Ceph
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m find_disks
-a "partition_name='KOLLA_CEPH_DATA'"
register: osd_lookup
......
---
- name: Creating Cinder database
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_db
-a "login_host='{{ database_address }}'
login_user='{{ database_user }}'
......@@ -18,7 +18,7 @@
database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
- name: Creating Cinder database user and setting permissions
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_user
-a "login_host='{{ database_address }}'
login_user='{{ database_user }}'
......
---
- name: Creating the Cinder service and endpoint
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_service
-a "service_name=cinder
service_type=volume
......@@ -20,7 +20,7 @@
run_once: True
- name: Creating the Cinder v2 service and endpoint
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_service
-a "service_name=cinderv2
service_type=volumev2
......@@ -40,7 +40,7 @@
run_once: True
- name: Creating the Cinder project, user, and role
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_user
-a "project=service
user=cinder
......
......@@ -6,7 +6,7 @@ common_run: False
####################
# Docker
####################
ansible_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-ansible"
ansible_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-toolbox"
ansible_tag: "{{ openstack_release }}"
ansible_image_full: "{{ ansible_image }}:{{ ansible_tag }}"
......
......@@ -5,7 +5,7 @@
common_options: "{{ docker_common_options }}"
image: "{{ rsyslog_image_full }}"
- name: Pulling kolla-ansible image
- name: Pulling kolla-toolbox image
kolla_docker:
action: "pull_image"
common_options: "{{ docker_common_options }}"
......
......@@ -11,7 +11,7 @@
- "/var/lib/kolla/dev:/dev"
- "rsyslog:/var/log"
- name: Starting kolla-ansible container
- name: Starting kolla-toolbox container
kolla_docker:
action: "start_container"
common_options: "{{ docker_common_options }}"
......@@ -19,7 +19,7 @@
ANSIBLE_NOCOLOR: "1"
ANSIBLE_LIBRARY: "/usr/share/ansible"
image: "{{ ansible_image_full }}"
name: "kolla_ansible"
name: "kolla_toolbox"
privileged: True
volumes:
- "/dev/:/dev/"
......
......@@ -6,8 +6,8 @@ $KLogPermitNonKernelFacility on
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
$RepeatedMsgReduction on
$template KollaAnsibleFile,"/var/log/kolla_ansible.log"
:syslogtag,contains,"ansible" ?KollaAnsibleFile
$template KollaToolboxFile,"/var/log/kolla_toolbox.log"
:syslogtag,contains,"toolbox" ?KollaToolboxFile
$template GlanceApiFile,"/var/log/glance/glance_api.log"
:syslogtag,contains,"glance-api" ?GlanceApiFile
......
---
- name: Creating Glance database
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_db
-a "login_host='{{ database_address }}'
login_user='{{ database_user }}'
......@@ -19,7 +19,7 @@
database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
- name: Creating Glance database user and setting permissions
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_user
-a "login_host='{{ database_address }}'
login_user='{{ database_user }}'
......
---
- name: Glance sanity checks
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_sanity
-a "service=glance
project=service
......
---
- name: Creating the Glance service and endpoint
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_service
-a "service_name=glance
service_type=image
......@@ -20,7 +20,7 @@
run_once: True
- name: Creating the Glance project, user, and role
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_user
-a "project=service
user=glance
......
---
- name: Creating Heat database
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_db
-a "login_host='{{ database_address }}'
login_user='{{ database_user }}'
......@@ -18,7 +18,7 @@
database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
- name: Creating Heat database user and setting permissions
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_user
-a "login_host='{{ database_address }}'
login_user='{{ database_user }}'
......
---
- name: Creating the Heat service and endpoint
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_service
-a "service_name=heat
service_type=orchestration
......@@ -20,7 +20,7 @@
run_once: True
- name: Creating the Heat-cfn service and endpoint
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_service
-a "service_name=heat-cfn
service_type=orchestration
......@@ -40,7 +40,7 @@
run_once: True
- name: Creating the Heat project, user, and role
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_user
-a "project=service
user=heat
......
---
- name: Creating Ironic database
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_db
-a "login_host='{{ database_address }}'
login_port='{{ mariadb_port }}'
......@@ -19,7 +19,7 @@
database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
- name: Creating Ironic database user and setting permissions
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_user
-a "login_host='{{ database_address }}'
login_port='{{ mariadb_port }}'
......
---
- name: Creating the Ironic service and endpoint
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_service
-a "service_name=ironic
service_type=baremetal
......@@ -20,7 +20,7 @@
run_once: True
- name: Creating the Ironic project, user, and role
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_user
-a "project=service
user={{ ironic_keystone_user }}
......
---
- name: Creating Keystone database
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_db
-a "login_host='{{ database_address }}'
login_port='{{ mariadb_port }}'
......@@ -19,7 +19,7 @@
database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
- name: Creating Keystone database user and setting permissions
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_user
-a "login_host='{{ database_address }}'
login_port='{{ mariadb_port }}'
......
---
- name: Keystone sanity checks
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_sanity
-a "service=keystone
project=service
......
---
- name: Creating the admin project, user and role
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_user
-a "project=admin
user=admin
......@@ -18,7 +18,7 @@
run_once: True
- name: Creating the Keystone service and endpoint
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_service
-a "service_name=keystone
service_type=identity
......
---
- name: Creating Magnum database
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_db
-a "login_host='{{ database_address }}'
login_user='{{ database_user }}'
......@@ -18,7 +18,7 @@
database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
- name: Creating Magnum database user and setting permissions
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m mysql_user
-a "login_host='{{ database_address }}'
login_user='{{ database_user }}'
......
---
- name: Creating the Magnum service and endpoint
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_service
-a "service_name=magnum
service_type=container
......@@ -20,7 +20,7 @@
run_once: True
- name: Creating the Magnum project, user, and role
command: docker exec -t kolla_ansible /usr/bin/ansible localhost
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m kolla_keystone_user
-a "project=service
user=magnum
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment