Merge "Remove start.yml and bootstrap.yml"

2 files changed, 0 insertions, 104 deletions

diff --git a/ansible/roles/bootstrap.yml b/ansible/roles/bootstrap.yml
deleted file mode 100644
index 9fbe64035..000000000
--- a/ansible/roles/bootstrap.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- name: Creating database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
-    -m mysql_db
-    -a "login_host='{{ database_address }}'
-        login_port='{{ mariadb_port }}'
-        login_user='{{ database_user }}'
-        login_password='{{ database_password }}'
-        name='{{ service_database_name }}'"
-  register: database
-  changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  failed_when: database.stdout.split()[2] != 'SUCCESS'
-  run_once: True
-
-- name: Creating database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
-    -m mysql_user
-    -a "login_host='{{ database_address }}'
-        login_port='{{ mariadb_port }}'
-        login_user='{{ database_user }}'
-        login_password='{{ database_password }}'
-        name='{{ service_database_name }}'
-        password='{{ service_database_password }}'
-        host='%'
-        priv='{{ service_database_name }}.*:ALL'
-        append_privs='yes'"
-  register: database_user_create
-  changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  failed_when: database_user_create.stdout.split()[2] != 'SUCCESS'
-  run_once: True
-
-- include: start.yml
-  vars:
-    run_once: True
-  when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
-
-# https://github.com/ansible/ansible-modules-core/pull/1031
-- name: Waiting for bootstrap container to exit
-  command: docker wait "{{ container_name }}"
-  when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
-
-- name: Cleaning up boostrap container
-  docker:
-    name: "{{ container_name }}"
-    image: "{{ container_image }}"
-    state: "absent"
-  when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
diff --git a/ansible/roles/start.yml b/ansible/roles/start.yml
deleted file mode 100644
index cdad31d4d..000000000
--- a/ansible/roles/start.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-# Using "state: reloaded" will restart the container if a new image is
-# pulled or the paramaters are modified.
-#
-# "pull: always" will _always_ pull the latest image. It registers a
-# change when the image has changed, regardless of "state"
-#
-# Due to a bug in the ansible docker module it doesnt properly supply the
-# docker_api_version from docker-py, so we specify it here. This will be
-# removed when the bugfix makes it downstream
-
-- name: Starting container(s)
-  docker:
-    command: "{{ container_command | default(None) }}"
-    detach: "{{ container_detach | default('True') }}"
-    env: "{{ container_environment | default({}) }}"
-    docker_api_version: "{{ docker_api_version }}"
-    image: "{{ container_image }}"
-    insecure_registry: "{{ docker_insecure_registry }}"
-    name: "{{ container_name }}"
-    net: "host"
-    password: "{{ docker_registry_password }}"
-    privileged: "{{ container_privileged | default('False') }}"
-    pull: "{{ docker_pull_policy }}"
-    registry: "{{ docker_registry }}"
-    restart_policy: "{{ container_restart_policy | default(docker_restart_policy) }}"
-    restart_policy_retry: "{{ docker_restart_policy_retry }}"
-    state: "reloaded"
-    username: "{{ docker_registry_username }}"
-    volumes: "{{ container_volumes | default([]) }}"
-    volumes_from: "{{ container_volumes_from | default([]) }}"
-  run_once: "{{ run_once | default('False') }}"
-  when: not container_pid|default(False)
-
-- name: Starting container(s)
-  docker:
-    command: "{{ container_command | default(None) }}"
-    detach: "{{ container_detach | default('True') }}"
-    env: "{{ container_environment | default({}) }}"
-    docker_api_version: "{{ docker_api_version }}"
-    image: "{{ container_image }}"
-    insecure_registry: "{{ docker_insecure_registry }}"
-    name: "{{ container_name }}"
-    net: "host"
-    pid: "host"
-    password: "{{ docker_registry_password }}"
-    privileged: "{{ container_privileged | default('False') }}"
-    pull: "{{ docker_pull_policy }}"
-    registry: "{{ docker_registry }}"
-    restart_policy: "{{ container_restart_policy | default(docker_restart_policy) }}"
-    restart_policy_retry: "{{ docker_restart_policy_retry }}"
-    state: "reloaded"
-    username: "{{ docker_registry_username }}"
-    volumes: "{{ container_volumes | default([]) }}"
-    volumes_from: "{{ container_volumes_from | default([]) }}"
-  run_once: "{{ run_once | default('False') }}"
-  when: container_pid|default(False)