I misunderstood pause. need sleep.

for galera to work.

ansible.cfg

@@ -1,2 +1,2 @@
 [defaults]
-inventory = merlin
+hostfile = hosts

gcc-site.yml

@@ -1,14 +1,14 @@
 ---
-- import_tasks: common.yml
+- include: common.yml
-- import_tasks: rabbitmq.yml
+- include: rabbitmq.yml
-- import_tasks: memcached.yml
+- include: memcached.yml
-- import_tasks: mariadb.yml
+- include: mariadb.yml
-- import_tasks: keystone.yml
+- include: keystone.yml
-- import_tasks: glance-controller.yml
+- include: glance-controller.yml
-- import_tasks: nova-controller.yml
+- include: nova-controller.yml
-- import_tasks: neutron-controller.yml
+- include: neutron-controller.yml
-- import_tasks: cinder-controller.yml
+- include: cinder-controller.yml
-- import_tasks: cinder-storage.yml
+- include: cinder-storage.yml
-- import_tasks: nova-compute.yml
+- include: nova-compute.yml
-- import_tasks: horizon.yml
+- include: horizon.yml
-- import_tasks: gcc-post-install.yml
+- include: gcc-post-install.yml

generate_secrets.py

@@ -5,7 +5,6 @@ Open the secrets.yml and replace all passwords.
 Original is backed up.
 """
 
-from os import path
 import random
 import string
 from subprocess import call
@@ -28,8 +27,7 @@ for key, value in data.iteritems():
         for _ in range(pass_length))
 
 # Make numbered backups of the secrets file.
-if path.isfile('secrets.yml'):
+call(['cp', '--backup=numbered', 'secrets.yml', 'secrets.yml.bak'])
-    call(['cp', '--backup=numbered', 'secrets.yml', 'secrets.yml.bak'])
 
 with open('secrets.yml', 'w') as f:
     dump(data, f, Dumper=Dumper, default_flow_style=False)

heat.yml

@@ -1,9 +0,0 @@
----
-- hosts: all
-  name: Dummy to gather facts
-  tasks: []
-
-- hosts: heat
-  become: True
-  roles:
-     - heat

hosts

@@ -1,9 +1,5 @@
-# A demo cluster of three nodes.
-
 [databases]
-openstack01-node01
 openstack01-node02
-openstack01-node03
 
 [keystone]
 openstack01-node03
@@ -19,9 +15,24 @@ openstack01-node01
 openstack01-node02
 openstack01-node03
 
+#[cassandra]
+#openstack01-node[01:03]
+
+#openstack01-node01
+#
+#[next_cassandra]
+#openstack01-node02
+#openstack01-node03
+
 [memcached]
 openstack01-node03
 
+#[first_cassandra:vars]
+#run_options=""
+#
+#[next_cassandra:vars]
+#run_options="-e CASSANDRA_SEEDS=172.23.41.1"
+
 [neutron-controller]
 openstack01-node01 physical_interface_mappings=provider:ens192
 
@@ -35,4 +46,4 @@ openstack01-node03
 openstack01-node01 storage_volume=/dev/loop0
 
 [nova-compute]
-openstack01-node04 physical_interface_mappings=provider:enp4s0f0
+openstack01-node04 physical_interface_mappings=provider:dummy0

merlin

@@ -1,37 +0,0 @@
-[nova-compute]
-merlin-managementnode002 physical_interface_mappings=provider:eno3
-merlin-managementnode003 physical_interface_mappings=provider:eno3
-merlin-node001 physical_interface_mappings=provider:eno3
-merlin-node003 physical_interface_mappings=provider:eno3
-merlin-node004 physical_interface_mappings=provider:eno3
-
-[databases]
-merlin-managementnode001
-merlin-managementnode002
-merlin-managementnode003
-
-[rabbitmq]
-merlin-managementnode001
-merlin-managementnode002
-merlin-managementnode003
-
-[horizon]
-merlin-managementnode001
-
-[memcached]
-merlin-managementnode001
-
-[nova-controller]
-merlin-managementnode001
-
-[keystone]
-merlin-managementnode001
-
-[neutron-controller]
-merlin-managementnode001 physical_interface_mappings=provider:eno3
-
-[heat]
-merlin-managementnode001
-
-[glance-controller]
-merlin-managementnode001

meta/main.yml

@@ -1 +0,0 @@
----

nuke.yml

@@ -1,21 +0,0 @@
----
-# This playbook will reset the instalation to facilitate a new installation.
-# All data is lost!
-- hosts: all
-  become: True
-  name: Dummy to gather facts
-  tasks:
-    - name: Stop docker service
-      shell: "systemctl stop docker"
-    - name: Verify docker is stopped.
-      systemd:
-        name: docker
-        state: stopped
-    - name: remove volumes
-      shell: "rm -rf /srv"
-
-- hosts: cinder-storage
-  become: True
-  tasks:
-    - name: wipe cinder storage.
-      shell: "dd if=/dev/zero of={{ storage_volume }} bs=1M count=1 && sync"

os-test

@@ -1,37 +0,0 @@
-# An all in one
-
-[databases]
-os-test
-
-[keystone]
-os-test
-
-[glance-controller]
-os-test
-
-[horizon]
-os-test
-
-[rabbitmq]
-os-test
-
-[memcached]
-os-test
-
-[neutron-controller]
-os-test physical_interface_mappings=provider:enp4s0f0
-
-[nova-controller]
-os-test
-
-[cinder-controller]
-os-test
-
-[cinder-storage]
-os-test storage_volume=/dev/sdb
-
-[nova-compute]
-os-test physical_interface_mappings=provider:enp4s0f0
-
-[all:vars]
-listen_ip=129.125.60.194

post-install.yml

@@ -19,7 +19,7 @@
         - >
             openstack subnet create --network provider
             --allocation-pool start={{ allocation_pool['start'] }},end={{ allocation_pool['end'] }}
-            --dns-nameserver {{ dns_nameserver }} --gateway {{ gateway }} --subnet-range {{ subnet_range }} providersub
+            --dns-nameserver {{ dns_nameserver }} --gateway {{ gateway }} --subnet-range {{ subnet_range }} provider
         - openstack flavor create --id 0 --vcpus 1 --ram 64 --disk 1 m1.nano
         - openstack keypair create --public-key /root/id_rsa.pub adminkey
 

roles/cinder-storage/tasks/main.yml

@@ -4,7 +4,6 @@
   include_vars:
     file: ../../secrets.yml
     name: secrets
-  tags: vars
 
 - set_fact:
     docker_image: registry.webhosting.rug.nl/hpc/openstack-cinder-storage:latest
@@ -21,7 +20,6 @@
         -e "RABBIT_HOST={{ listen_ip | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}"
         -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"
         -e "RABBIT_USER=openstack"
-  tags: vars
 
 - name: pull docker image
   docker_image:
@@ -54,10 +52,8 @@
     mode: 644
     owner: root
     group: root
-  tags: systemd
 
 - command: systemctl daemon-reload
-  tags: systemd
 
 - name: start service at boot.
   command: systemctl reenable cinder-storage.service

roles/cinder-storage/templates/cinder-storage.service

@@ -11,13 +11,9 @@ ExecStartPre=-/usr/bin/docker rm %n
 ExecStart=/usr/bin/docker run --name %n \
   --privileged \
   {{ env_vars | replace('\n', '') }} \
-  -v "/dev/cinder-volumes/":/dev/cinder-volumes \
   -v /srv/cinder-storage/root:/root \
   -v "{{ storage_volume }}":/dev/cinder_storage_volume \
-  -v "/dev/lvm":/dev/lvm \
-  -v "/srv/cinder-storage/volumes/:/var/lib/cinder/volumes/" \
   -p 8777:8776 \
-  -p 3260:3260 \
   {{ docker_image }}
 
 [Install]

roles/common/tasks/docker.yml

@@ -13,8 +13,3 @@
   with_items:
      - docker-engine
      - python-docker
-
-- name: make sure service is started
-  systemd:
-    name: docker.service
-    state: started

roles/common/tasks/main.yml

@@ -5,7 +5,7 @@
 - name: Passwordless sudo for admins
   lineinfile: dest=/etc/sudoers line="%admin  ALL=(ALL:ALL) NOPASSWD:ALL"
 
-- import_tasks: users.yml
+- include: users.yml
 
 - name: common | install packages
   apt: pkg={{ item }} state=latest update_cache=yes
@@ -26,4 +26,4 @@
     owner: root
     group: root
 
-- import_tasks: docker.yml
+- include: docker.yml

roles/heat/tasks/main.yml

@@ -1,62 +0,0 @@
-# Build and install a docker image for heat.
----
-- name: include secrets
-  include_vars:
-    file: ../../secrets.yml
-    name: secrets
-
-- set_fact:
-    docker_image: registry.webhosting.rug.nl/hpc/openstack-heat:latest
-    env_vars: >
-        -e "HEAT_HOST={{ listen_ip | default(hostvars[groups['heat'][0]]['ansible_default_ipv4']['address']) }}"
-        -e "HEAT_PASSWORD={{ secrets['HEAT_PASSWORD'] }}"
-        -e "HEAT_USER=heat"
-        -e "KEYSTONE_HOST={{ listen_ip | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }}"
-        -e "MEMCACHED_HOST={{ listen_ip | default(hostvars[groups['memcached'][0]]['ansible_default_ipv4']['address']) }}"
-        -e "MYSQL_HOST={{ listen_ip | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }}"
-        -e "MYSQL_ROOT_PASSWORD={{ secrets['MYSQL_ROOT_PASSWORD'] }}"
-        -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}"
-        -e "RABBIT_HOST={{ listen_ip | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}"
-        -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"
-        -e "RABBIT_USER=openstack"
-
-- name: pull docker image
-  docker_image:
-    name: "{{ docker_image }}"
-  tags: pull
-
-- name: Make build and persistent directories
-  file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0777
-  with_items:
-      - /srv/heat
-      - /srv/heat/root
-
-- name: install service file.
-  template:
-    src: templates/heat.service
-    dest: /etc/systemd/system/heat.service
-    mode: 644
-    owner: root
-    group: root
-
-- name: start service at boot.
-  command: systemctl reenable heat.service
-
-- command: systemctl daemon-reload
-
-- name: Initialize database.
-  command: >
-             /usr/bin/docker run --rm
-             {{ env_vars }}
-             --add-host=keystone:{{ listen_ip | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }} \
-             -v /srv/heat/root:/root \
-             {{ docker_image }} /etc/bootstrap.sh
-  tags: bootstrap
-
-- name: make sure service is started
-  systemd:
-    name: heat.service
-    state: restarted

roles/heat/templates/heat.service

@@ -1,19 +0,0 @@
-[Unit]
-Description=Openstack heat Container
-After=docker.service
-Requires=docker.service
-
-[Service]
-TimeoutStartSec=0
-Restart=always
-ExecStartPre=-/usr/bin/docker kill %n
-ExecStartPre=-/usr/bin/docker rm %n
-ExecStart=/usr/bin/docker run --name %n \
-  {{ env_vars | replace('\n', '') }} \
-  -v /srv/heat/root:/root \
-  -p 8000:8000 \
-  -p 8004:8004 \
-  {{ docker_image }}
-
-[Install]
-WantedBy=multi-user.target

roles/horizon/templates/horizon.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Openstack Horizon Container
+Description=Openstack Glance Container
 After=docker.service
 Requires=docker.service
 

roles/keystone/tasks/main.yml

@@ -52,7 +52,7 @@
   delay: 3
   ignore_errors: yes
 
-- name: keystone manage commands to setup db_sync
+- name: keystone manage commands to setup db
   command: >
              /usr/bin/docker run --rm
              --add-host=mariadb:{{ listen_ip | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }}
@@ -69,11 +69,6 @@
                     --bootstrap-internal-url http://{{ listen_ip | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }}:35357/v3/
                     --bootstrap-public-url http://{{ listen_ip | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }}:5000/v3/
                     --bootstrap-region-id RegionOne
-  # sometimes the initial connect fails.
-  # Retry until it succeeds.
-  retries: 7
-  delay: 3
-  ignore_errors: yes
 
 - name: make sure service is started
   systemd:
@@ -90,26 +85,12 @@
              -e "OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3"
              -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}"
              {{ docker_image }} bash /etc/bootstrap.sh
-  register: result
-  retries: 7
-  delay: 3
-
-- name: install openstack repo host key.
-  command: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5EDB1B62EC4926EA
-  tags: openstackclient
-
-- name: install openstack repo on host.
-  apt_repository:
-      repo: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
-      filename: ocata
-  tags: openstackclient
 
 - name: install openstack client for management
   apt:
     name: python-openstackclient
     state: latest
     update_cache: yes
-  tags: openstackclient
 
 - name: source admin-openrc.sh in root .bashrc
   lineinfile:

roles/mariadb/tasks/main.yml

@@ -21,14 +21,12 @@
     dest: /srv/mariadb/etc/mysql/conf.d/my.cnf
     mode: 660
 
-- name: >
+- name: Set galara.cnf on node if we have at least three nodes.
-        Set galara.cnf on node if we have at least three nodes.
-        And we're part of the cluster.
   template:
     src: files/galera.cnf
     dest: /srv/mariadb/etc/mysql/conf.d/galera.cnf
     mode: 660
-  when: "'databases' in group_names and groups['databases'] | length >= 3"
+  when: groups['databases'] | length >= 3
 
   # This mimics galera_new_cluster.sh
 - name: Initialize a new cluster.
@@ -49,8 +47,7 @@
         name: mysql.service
         state: started
 
-  when: "'databases' in group_names and groups['databases'] \
+  when: groups['databases'] | length >= 3 and ansible_hostname == hostname_node0
-         | length >= 3 and ansible_hostname == hostname_node0"
 
 - name: install service file.
   block:
@@ -64,22 +61,12 @@
         group: root
 
 - name: Give the master node some time to initialize the cluster.
-  command: bash -c "sleep 60"
+  command: bash -c "sleep 60 && systemctl daemon-reload"
-  when: "'databases' in group_names and groups['databases'] \
-         | length >= 3"
-
-- name: Daemon reload (the implicit doesn't work)
-  command: bash -c "systemctl daemon-reload"
 
 - name: make sure service is started
   systemd:
     name: mysql.service
     state: started
-    daemon_reload: yes
 
 - name: start service at boot.
   command: systemctl reenable mysql.service
-
-- name: Give the cluster some time to initialize replication.
-  command: bash -c "sleep 60 && systemctl daemon-reload"
-  when: "'databases' in group_names and groups['databases'] | length >= 3"

roles/nova-compute/tasks/main.yml

@@ -4,11 +4,10 @@
   include_vars:
     file: ../../secrets.yml
     name: secrets
-  tags: vars
 
 - set_fact:
     docker_image: registry.webhosting.rug.nl/hpc/openstack-nova-compute:latest
-  tags: vars
+  tags: facts
 
 - name: pull docker image
   docker_image:
@@ -23,13 +22,11 @@
     mode: 644
     owner: root
     group: root
-  tags: systemd
 
 - command: systemctl daemon-reload
-  tags: systemd
 
 - apt:
-    name: "{{ item }}"
+    name: '{{ item }}'
   with_items:
       - kvm
       - libvirt0
@@ -45,5 +42,5 @@
   command: systemctl reenable nova-compute.service
 
 - name: let nova controler discover new host
-  shell: "sleep 10 && docker exec -i nova-controller.service nova-manage cell_v2 discover_hosts"
+  command: docker exec -i nova-controller.service nova-manage cell_v2 discover_hosts
   delegate_to: "{{ hostvars[groups['nova-controller'][0]]['ansible_hostname'] }}"

roles/nova-compute/templates/nova-compute.service

@@ -11,9 +11,8 @@ ExecStartPre=-/usr/bin/docker rm %n
 ExecStart=/usr/bin/docker run --name %n \
     -e "GLANCE_CONTROLLER_HOST={{ hostvars[groups['glance-controller'][0]]['listen_ip'] | default(hostvars[groups['glance-controller'][0]]['ansible_default_ipv4']['address']) }}" \
     -e "KEYSTONE_HOST={{ hostvars[groups['keystone'][0]]['listen_ip'] | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }}" \
-    -e "METADATA_SECRET={{ secrets['METADATA_SECRET'] }}" \
     -e "MEMCACHED_HOST={{ hostvars[groups['memcached'][0]]['listen_ip'] | default(hostvars[groups['memcached'][0]]['ansible_default_ipv4']['address']) }}" \
-    -e "MY_IP={{ listen_ip | default(ansible_default_ipv4.address) }}" \
+    -e "MY_IP={{ hostvars[groups['nova-compute'][0]]['listen_ip'] | default(hostvars[groups['nova-compute'][0]]['ansible_default_ipv4']['address']) }}" \
     -e "MYSQL_HOST={{ hostvars[groups['databases'][0]]['listen_ip'] | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }}" \
     -e "MYSQL_ROOT_PASSWORD={{ secrets['MYSQL_ROOT_PASSWORD'] }}" \
     -e "NEUTRON_CONTROLLER_HOST={{ hostvars[groups['neutron-controller'][0]]['listen_ip'] | default(hostvars[groups['neutron-controller'][0]]['ansible_default_ipv4']['address']) }}" \
@@ -34,7 +33,6 @@ ExecStart=/usr/bin/docker run --name %n \
     --add-host=keystone:{{ hostvars[groups['keystone'][0]]['listen_ip'] | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }} \
     --add-host=mariadb:{{ hostvars[groups['databases'][0]]['listen_ip'] | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }} \
     --privileged \
-    -v /dev:/dev \
     -v /var/run/libvirt/libvirt-sock:/var/run/libvirt/libvirt-sock \
     -v /var/lib/nova/instances:/var/lib/nova/instances \
     -v /lib/modules:/lib/modules \

roles/nova-controller/tasks/main.yml

@@ -19,12 +19,11 @@
     env_vars: >
         -e "GLANCE_CONTROLLER_HOST={{ listen_ip | default(hostvars[groups['glance-controller'][0]]['ansible_default_ipv4']['address']) }}"
         -e "KEYSTONE_HOST={{ listen_ip | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }}"
-        -e "METADATA_SECRET={{ secrets['METADATA_SECRET'] }}"
         -e "MEMCACHED_HOST={{ listen_ip | default(hostvars[groups['memcached'][0]]['ansible_default_ipv4']['address']) }}"
-        -e "MY_IP={{ listen_ip | default(ansible_default_ipv4.address) }}"
+        -e "MY_IP={{ listen_ip | default(hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address']) }}"
         -e "MYSQL_HOST={{ listen_ip | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }}"
         -e "MYSQL_ROOT_PASSWORD={{ secrets['MYSQL_ROOT_PASSWORD'] }}"
-        -e "NEUTRON_CONTROLLER_HOST={{ hostvars[groups['neutron-controller'][0]]['listen_ip'] | default(hostvars[groups['neutron-controller'][0]]['ansible_default_ipv4']['address']) }}"
+        -e "NEUTRON_CONTROLLER_HOST={{ listen_ip | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }}"
         -e "NEUTRON_PASSWORD={{ secrets['NEUTRON_PASSWORD'] }}"
         -e "NEUTRON_USER=neutron"
         -e "NOVA_CONTROLLER_HOST={{ listen_ip | default(hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address']) }}"

roles/nova-controller/templates/nova-controller.service

@@ -15,7 +15,6 @@ ExecStart=/usr/bin/docker run --name %n \
   --privileged \
   -v /srv/nova-controller/root:/root \
   -p 8774:8774 \
-  -p 8775:8775 \
   -p 8778:8778 \
   -p 6080:6080 \
   {{ docker_image }} /etc/run.sh

roles/rabbitmq/files/rabbitmq.service

@@ -14,7 +14,7 @@ ExecStart=/usr/bin/docker run \
           --add-host "{{ host }}:{{ hostvars[host]['listen_ip'] | default(hostvars[host]['ansible_default_ipv4']['address']) }}" \
 {% endfor %}
           -p 4369:4369 -p 25679:25679 -p 25672:25672 -p 5671-5672:5671-5672 -p 8080:15672 \
-          -e "RABBITMQ_DEFAULT_USER=openstack" -e "RABBITMQ_DEFAULT_PASS={{ secrets['RABBIT_PASSWORD'] }}" \
+          -e "RABBITMQ_DEFAULT_USER=user" -e "RABBITMQ_DEFAULT_PASS={{ secrets['RABBIT_PASSWORD'] }}" \
           -e "RABBITMQ_ERLANG_COOKIE={{ secrets['RABBITMQ_ERLANG_COOKIE'] }}" \
           -e "RABBITMQ_NODENAME=rabbit_{{ ansible_nodename }}" \
           --hostname "{{ ansible_nodename }}" --name %n rabbitmq:3-management

roles/rabbitmq/tasks/main.yml

@@ -37,3 +37,11 @@
       - rabbitmqctl start_app
   when: ansible_nodename != hostname_node0
 
+- name: create openstack user
+  command: "docker exec -i rabbitmq.service {{ item }}"
+  with_items:
+      - rabbitmqctl add_user openstack "{{ secrets['RABBIT_PASSWORD'] }}"
+      - rabbitmqctl set_permissions openstack ".*" ".*" ".*"
+  when: ansible_nodename == hostname_node0
+  register: command_result
+  failed_when: "command_result.rc not in (0, 70)"

secrets.yml

@@ -1,32 +1,30 @@
 $ANSIBLE_VAULT;1.1;AES256
-32313865346461323861313234623330633830663561353636396161643566353733393931303232
+35643437313834633532373265366630663035336231306639623561613765386332663334343237
-3134353364393034626564333866383065633162383561390a656463303464616434303435303037
+3339363162303463353437326331656532336138373066620a623137643762383532376361353364
-63313232373630616136626464373464646535353030396136656361343162666165366566383737
+37646236386466353636396535376463333133323664316634663466663164303063383830653039
-6133326539393432390a386162393639636137326532393939633665326637373461663766656565
+3535666361303562630a316137376531636537383138663662373865383431343035646539356137
-36636661653939373134313165383261353832373362613533366431626330313831643836363932
+38323866643831353537366630363333663865383261633938346664633362343661343839383766
-38623937663335646134323130636539333335636265313564323032623065393031343235633832
+66363733356333303334323136376136353738376362376231353338343763663131363731343639
-33336138653336633932383133366566656464356331306265663662356166613135663234326434
+61383138626235633663666430383964616239363035663663646133636434363032626633663865
-64343765366439303766613062363830346238376435366138323662366463353634623937376663
+30663732646630393163653461626435333463396463333236313930346461626364626166386365
-39313263613764623533323562333932656564346462333961663538353366313065343263383431
+66323736316230376165666366363136666533376335316132343361393532616536383965363339
-39643734353632336134663965343062373933656461393264323938303261316563313962343837
+30376362356665633630393561653532613139366236663961643864383738353430666562623730
-66623562333031646633643734383439386130653033343962633930613031313433633033383561
+34663166393665653265663836623731386235633062306562373935633737363639383336303539
-65366230663263346661343339636537336332323266623230646534323563373934356332663136
+37663763623664623038316438356138363134646230643261646262353163333430616462393866
-30626231623534616562323033333437353239306538653835623931363164383536336562336136
+31666233636233356464633436626637313633623736343264613037353432386131393964386663
-30666265366536313436646535383632626137613831633132666666653830383566323532306332
+36353236613662633764366437306461316138366461653731373436613039346663663536653362
-34353534336331653330663137323936303337306134333036633932363664643864333534316438
+38656636303935626563303732666261373665303035333661643865393166653330646336393961
-31623062303137376637353061643838383831663561663436663130663064323665316261316531
+31646539396131626464313733383638656438613530663166393035343630353764313232323432
-32616533333165636130623334373130316339326538343330646366383933353137623631323530
+34386334666231323261343765623636313032373835396332623037613866613636393038653266
-39653437343432383161323661643931346664663265326664336461373033646563666333353661
+36336531356534633933383432646663663364376130386239613836336263623161326563346661
-61633865373764346131623131346266373331626336663735303439376230333537386562303939
+33636232313866613662353661373533383138393434396338343934326333326238336638396462
-65363139346564653464663633326639323930333464376136353064393039373535613231623138
+65376133343038313437343934373265333632663133653133656130636533663237623839623634
-61373434323065646238356436373730333939613965666237616265653033333230353466316266
+35363764363763363465363437623964363362616261663166633066373033633864336532633031
-30383939376335656632626232663061623332636337646234653565363561353334643462376666
+32323733616562663031303230383561373637326436336462363461313532623262653866323862
-30326438303333336265306463313137656334313235643434616238333564373761333235633639
+34643631333533626537373538353564306261313035303530666462326534633638363932363037
-66346161316130633463623435646639366136386335386139613230653064663230366265633036
+65336230373034643966656561303164373463353638316632613431643535303930373334383134
-33613132633035393337653436613031383765616638323663363866393165613030306637393134
+38323731363535313065326330653666323934636466386238616664316635303333653631396639
-38333734373939626364343533306662393463646264666161346434363832623239643864303431
+39303737613361653862343964303231393164346134633366633262326230643137303331373231
-39383931333139633338663761646335613935636239636439383333313531633364653439323036
+31323832363937663935333737613133323265323863623933633962633230386339636432643937
-35373639363164386666366335313934336231333261623763633133393562656237313761356631
+66653763376663666637353738646565343835333937343765356539383734316231623466343634
-39663234653339313466326534333435306662316461333035623339353435383137383735373733
+30663135663938393561333133663737653635393432333534306466366332333338
-32373535303338646266346539386364356233616631316661633037346665353762353138376538
-386535333439313233663464353534376535

secrets.yml.topol

@@ -9,5 +9,3 @@ OS_PASSWORD:   # Keystone admin password
 OS_DEMO_PASSWORD: # Keystone demo user password
 RABBIT_PASSWORD:
 RABBITMQ_ERLANG_COOKIE:
-CINDER_PASSWORD:
-HEAT_PASSWORD:

site.yml

@@ -1,15 +1,14 @@
 ---
-- import_playbook: common.yml
+- include: common.yml
-- import_playbook: rabbitmq.yml
+- include: rabbitmq.yml
-- import_playbook: memcached.yml
+- include: memcached.yml
-- import_playbook: mariadb.yml
+- include: mariadb.yml
-- import_playbook: keystone.yml
+- include: keystone.yml
-- import_playbook: glance-controller.yml
+- include: glance-controller.yml
-- import_playbook: nova-controller.yml
+- include: nova-controller.yml
-- import_playbook: neutron-controller.yml
+- include: neutron-controller.yml
-- import_playbook: cinder-controller.yml
+- include: cinder-controller.yml
-- import_playbook: cinder-storage.yml
+- include: cinder-storage.yml
-- import_playbook: nova-compute.yml
+- include: nova-compute.yml
-- import_playbook: horizon.yml
+- include: horizon.yml
-- import_playbook: heat.yml
+- include: post-install.yml
-- import_playbook: post-install.yml

test_hosts

@@ -1,48 +1,30 @@
 [databases]
-openstack-test05
+ansible-test
-openstack-test06
+ansible-test-2
-openstack-test07
+ansible-test-3
 
 [keystone]
-openstack-test05
+ansible-test-3
 
 [glance-controller]
-openstack-test05
+ansible-test-2
 
 [horizon]
-openstack-test05
+ansible-test-3
 
 [rabbitmq]
-openstack-test05
+ansible-test
-openstack-test06
+ansible-test-2
-openstack-test07
+ansible-test-3
 
 [memcached]
-openstack-test05
+ansible-test-3
 
 [neutron-controller]
-openstack-test05 physical_interface_mappings=provider:enp4s0f0
+ansible-test physical_interface_mappings=provider:ens10
 
 [nova-controller]
-openstack-test05
+ansible-test
-
-[cinder-controller]
-openstack-test05
-
-[heat]
-openstack-test05
-
-[cinder-storage]
-openstack-test05 storage_volume=/dev/openstack-test05-vg/cinder
-openstack-test06 storage_volume=/dev/openstack-test06-vg/cinder
-openstack-test07 storage_volume=/dev/openstack-test07-vg/cinder
-openstack-test08 storage_volume=/dev/openstack-test08-vg/cinder
-openstack-test09 storage_volume=/dev/openstack-test09-vg/cinder
-openstack-test10 storage_volume=/dev/openstack-test10-vg/cinder
 
 [nova-compute]
-openstack-test06 physical_interface_mappings=provider:enp4s0f0
+ansible-test-2 physical_interface_mappings=provider:ens10
-openstack-test07 physical_interface_mappings=provider:enp4s0f0
-openstack-test08 physical_interface_mappings=provider:enp4s0f0
-openstack-test09 physical_interface_mappings=provider:enp4s0f0
-openstack-test10 physical_interface_mappings=provider:enp4s0f0