Merge branch 'feature/add-variables'

Added mtu size variable
Added configure_networks bool and mtu_size var
2018-04-18 10:49:09 +02:00 · 2018-04-18 10:46:42 +02:00 · 2018-04-16 17:07:17 +02:00 · 2018-01-19 09:24:39 +01:00 · 2018-01-19 09:18:10 +01:00
27 changed files with 140 additions and 241 deletions
--- a/ansible.cfg
+++ b/ansible.cfg
@ -1,6 +1,2 @@
 [defaults]
-inventory = hosts
-stdout_callback = debug
-vault_password_file = .vault_pass.txt
-forks = 20
-host_key_checking = false
+hostfile = hosts
--- a/cinder-controller.yml
+++ b/cinder-controller.yml
@ -1,13 +1,7 @@
 ---
 - hosts: all
  name: Dummy to gather facts
-  tasks:
-    - name: gather facts even if hosts are excluded.
-      setup:
-      delegate_to: "{{item}}"
-      delegate_facts: True
-      loop: "{{groups['all']}}"
-
+  tasks: []

 - hosts: cinder-controller
  become: True
--- a/common.yml
+++ b/common.yml
@ -1,11 +1,5 @@
 ---
 - hosts: all
  become: True
-  vars_prompt:
-    - name: "docker_user"
-      prompt: "What is your p number?"
-    - name: "docker_pass"
-      prompt: "What is your password?"
-      private: yes
  roles:
      - common
--- a/gcc-site.yml
+++ b/gcc-site.yml
@ -1,14 +1,14 @@
 ---
- import_tasks: common.yml
- import_tasks: rabbitmq.yml
- import_tasks: memcached.yml
- import_tasks: mariadb.yml
- import_tasks: keystone.yml
- import_tasks: glance-controller.yml
- import_tasks: nova-controller.yml
- import_tasks: neutron-controller.yml
- import_tasks: cinder-controller.yml
- import_tasks: cinder-storage.yml
- import_tasks: nova-compute.yml
- import_tasks: horizon.yml
- import_tasks: gcc-post-install.yml
+- include: common.yml
+- include: rabbitmq.yml
+- include: memcached.yml
+- include: mariadb.yml
+- include: keystone.yml
+- include: glance-controller.yml
+- include: nova-controller.yml
+- include: neutron-controller.yml
+- include: cinder-controller.yml
+- include: cinder-storage.yml
+- include: nova-compute.yml
+- include: horizon.yml
+- include: gcc-post-install.yml
--- a/group_vars/horizon.yml
+++ b/group_vars/horizon.yml
@ -1,2 +0,0 @@
---
-security_fail2ban_enabled: false
--- a/horizon.yml
+++ b/horizon.yml
@ -6,5 +6,4 @@
 - hosts: horizon
  become: True
  roles:
-     - geerlingguy.security
     - horizon
--- a/host_vars/openstack03
+++ b/host_vars/openstack03
@ -1,2 +0,0 @@
---
-listen_ip: '172.23.40.243'
--- a/host_vars/openstack04
+++ b/host_vars/openstack04
@ -1,2 +0,0 @@
---
-listen_ip: '172.23.40.253'
--- a/37
+++ b/37
@ -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
--- a/neutron-controller.yml
+++ b/neutron-controller.yml
@ -5,5 +5,7 @@

 - hosts: neutron-controller
  become: True
+  vars_files:
+    - settings.yml
  roles:
-     - neutron-controller
+    - neutron-controller
--- a/nova-compute.yml
+++ b/nova-compute.yml
@ -5,5 +5,7 @@

 - hosts: nova-compute
  become: True
+  vars_files:
+    - settings.yml
  roles:
-     - nova-compute
+    - nova-compute
--- a/nuke.yml
+++ b/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"
--- a/8
+++ b/8
@ -26,14 +26,10 @@ openstack03
 openstack03

 [cinder-storage]
-openstack01 storage_volume=/dev/sdc3
-openstack02 storage_volume=/dev/sda5
 openstack03 storage_volume=/dev/sdb1
-openstack04 storage_volume=/dev/sdb1

 [nova-compute]
-openstack01 physical_interface_mappings=provider:bond0
-openstack02 physical_interface_mappings=provider:enp34s0f1
 openstack03 physical_interface_mappings=provider:enp4s0f0
-openstack04 physical_interface_mappings=provider:eno1

+[all:vars]
+listen_ip=172.23.40.243
--- a/post-install.yml
+++ b/post-install.yml
@ -20,7 +20,20 @@
            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
+      when: "{{ configure_networks }}" == True
+
+
+- hosts: keystone
+  become: True
+  vars_files:
+    - settings.yml
+  tasks:
+    - name: copy public key
+      copy:
+        content: "{{ rsa_pub }}"
+        dest: /srv/keystone/root/id_rsa.pub
+    - name: post install configuration
+      command: docker exec -i keystone.service bash -c "source /root/admin-openrc.sh && {{ item }}"
+      with_items:
        - openstack flavor create --id 0 --vcpus 1 --ram 64 --disk 1 m1.nano
        - openstack keypair create --public-key /root/id_rsa.pub adminkey
-
-
--- a/roles/cinder-storage/tasks/main.yml
+++ b/roles/cinder-storage/tasks/main.yml
@ -20,9 +20,7 @@
        -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 "AVAILABILITY_ZONE={{ ansible_nodename }}"
        -e "RABBIT_USER=openstack"
-        -e "CINDER_STORAGE_VOLUME={{ storage_volume }}"
  tags: vars

 - name: pull docker image
@ -45,7 +43,7 @@
             --privileged
             {{ env_vars }}
             -v /srv/cinder-storage/root:/root \
-             -v /dev:/dev \
+             -v "{{ storage_volume }}":/dev/cinder_storage_volume \
             {{ docker_image }} /etc/bootstrap.sh
  tags: bootstrap

--- a/roles/cinder-storage/templates/cinder-storage.service
+++ b/roles/cinder-storage/templates/cinder-storage.service
@ -11,10 +11,13 @@ 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 "/dev":/dev \
-  -v "/var/lib/cinder:/var/lib/cinder" \
-  --network=host \
+  -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]
--- a/roles/common/tasks/main.yml
+++ b/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,11 +26,4 @@
    owner: root
    group: root

-    #- import_tasks: docker.yml
-
-
- name: Log into DockerHub
-  docker_login:
-    registry: registry.webhosting.rug.nl
-    username: "{{ docker_user }}"
-    password: "{{ docker_pass }}"
+- include: docker.yml
--- a/roles/horizon/templates/horizon.service
+++ b/roles/horizon/templates/horizon.service
@ -1,5 +1,5 @@
 [Unit]
-Description=Openstack Horizon Container
+Description=Openstack Glance Container
 After=docker.service
 Requires=docker.service

--- a/roles/keystone/tasks/main.yml
+++ b/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,18 +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
+  command: >
+      echo "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" > /etc/apt/sources.list.d/ocata.list &&
+      apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5EDB1B62EC4926EA
  tags: openstackclient

 - name: install openstack client for management
--- a/roles/keystone/templates/admin-openrc.sh
+++ b/roles/keystone/templates/admin-openrc.sh
@ -1,5 +1,3 @@
-export OS_PROJECT_DOMAIN_NAME=Default
-export OS_USER_DOMAIN_NAME=Default
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD={{ hostvars[groups['keystone'][0]]['OS_PASSWORD'] }}
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@ -11,9 +11,9 @@
    state: directory
    mode: 0777
  with_items:
-    - /srv/mariadb/lib/mysql
-    - /srv/mariadb/etc/mysql
-    - /srv/mariadb/etc/mysql/conf.d
+      - /srv/mariadb/lib/mysql
+      - /srv/mariadb/etc/mysql
+      - /srv/mariadb/etc/mysql/conf.d

 - name: place settings file
  copy:
@ -21,14 +21,12 @@
    dest: /srv/mariadb/etc/mysql/conf.d/my.cnf
    mode: 660

- name: >
-        Set galara.cnf on node if we have at least three nodes.
-        And we're part of the cluster.
+- name: Set galara.cnf on node if we have at least three nodes.
  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'] \
-         | length >= 3 and ansible_hostname == hostname_node0"
+  when: groups['databases'] | 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"
-  when: "'databases' in group_names and groups['databases'] \
-         | length >= 3"
-
- name: Daemon reload (the implicit doesn't work)
-  command: bash -c "systemctl daemon-reload"
+  command: bash -c "sleep 60 && 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"
--- a/roles/neutron-controller/tasks/main.yml
+++ b/roles/neutron-controller/tasks/main.yml
@ -16,6 +16,7 @@

 - set_fact:
    env_vars: >
+        -e "GLOBAL_PHYSNET_MTU={{ global_physnet_mtu }}"
        -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 "METADATA_SECRET={{ secrets['METADATA_SECRET'] }}"
--- a/roles/nova-compute/templates/nova-compute.service
+++ b/roles/nova-compute/templates/nova-compute.service
@ -10,6 +10,8 @@ ExecStartPre=-/usr/bin/docker kill %n
 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 "GLOBAL_PHYSNET_MTU={{ global_physnet_mtu }}" \
+    -e "GLOBAL_PHYSNET_MTU={{ global_physnet_mtu }}" \
    -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']) }}" \
@ -31,7 +33,6 @@ ExecStart=/usr/bin/docker run --name %n \
    -e "RABBIT_HOST={{ hostvars[groups['rabbitmq'][0]]['listen_ip'] | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}" \
    -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}" \
    -e "RABBIT_USER=openstack" \
-    -e "AVAILABILITY_ZONE={{ ansible_nodename }}" \
    --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 \
--- a/secrets.yml
+++ b/secrets.yml
@ -1,32 +1,30 @@
 $ANSIBLE_VAULT;1.1;AES256
-32313865346461323861313234623330633830663561353636396161643566353733393931303232
-3134353364393034626564333866383065633162383561390a656463303464616434303435303037
-63313232373630616136626464373464646535353030396136656361343162666165366566383737
-6133326539393432390a386162393639636137326532393939633665326637373461663766656565
-36636661653939373134313165383261353832373362613533366431626330313831643836363932
-38623937663335646134323130636539333335636265313564323032623065393031343235633832
-33336138653336633932383133366566656464356331306265663662356166613135663234326434
-64343765366439303766613062363830346238376435366138323662366463353634623937376663
-39313263613764623533323562333932656564346462333961663538353366313065343263383431
-39643734353632336134663965343062373933656461393264323938303261316563313962343837
-66623562333031646633643734383439386130653033343962633930613031313433633033383561
-65366230663263346661343339636537336332323266623230646534323563373934356332663136
-30626231623534616562323033333437353239306538653835623931363164383536336562336136
-30666265366536313436646535383632626137613831633132666666653830383566323532306332
-34353534336331653330663137323936303337306134333036633932363664643864333534316438
-31623062303137376637353061643838383831663561663436663130663064323665316261316531
-32616533333165636130623334373130316339326538343330646366383933353137623631323530
-39653437343432383161323661643931346664663265326664336461373033646563666333353661
-61633865373764346131623131346266373331626336663735303439376230333537386562303939
-65363139346564653464663633326639323930333464376136353064393039373535613231623138
-61373434323065646238356436373730333939613965666237616265653033333230353466316266
-30383939376335656632626232663061623332636337646234653565363561353334643462376666
-30326438303333336265306463313137656334313235643434616238333564373761333235633639
-66346161316130633463623435646639366136386335386139613230653064663230366265633036
-33613132633035393337653436613031383765616638323663363866393165613030306637393134
-38333734373939626364343533306662393463646264666161346434363832623239643864303431
-39383931333139633338663761646335613935636239636439383333313531633364653439323036
-35373639363164386666366335313934336231333261623763633133393562656237313761356631
-39663234653339313466326534333435306662316461333035623339353435383137383735373733
-32373535303338646266346539386364356233616631316661633037346665353762353138376538
-386535333439313233663464353534376535
+35643437313834633532373265366630663035336231306639623561613765386332663334343237
+3339363162303463353437326331656532336138373066620a623137643762383532376361353364
+37646236386466353636396535376463333133323664316634663466663164303063383830653039
+3535666361303562630a316137376531636537383138663662373865383431343035646539356137
+38323866643831353537366630363333663865383261633938346664633362343661343839383766
+66363733356333303334323136376136353738376362376231353338343763663131363731343639
+61383138626235633663666430383964616239363035663663646133636434363032626633663865
+30663732646630393163653461626435333463396463333236313930346461626364626166386365
+66323736316230376165666366363136666533376335316132343361393532616536383965363339
+30376362356665633630393561653532613139366236663961643864383738353430666562623730
+34663166393665653265663836623731386235633062306562373935633737363639383336303539
+37663763623664623038316438356138363134646230643261646262353163333430616462393866
+31666233636233356464633436626637313633623736343264613037353432386131393964386663
+36353236613662633764366437306461316138366461653731373436613039346663663536653362
+38656636303935626563303732666261373665303035333661643865393166653330646336393961
+31646539396131626464313733383638656438613530663166393035343630353764313232323432
+34386334666231323261343765623636313032373835396332623037613866613636393038653266
+36336531356534633933383432646663663364376130386239613836336263623161326563346661
+33636232313866613662353661373533383138393434396338343934326333326238336638396462
+65376133343038313437343934373265333632663133653133656130636533663237623839623634
+35363764363763363465363437623964363362616261663166633066373033633864336532633031
+32323733616562663031303230383561373637326436336462363461313532623262653866323862
+34643631333533626537373538353564306261313035303530666462326534633638363932363037
+65336230373034643966656561303164373463353638316632613431643535303930373334383134
+38323731363535313065326330653666323934636466386238616664316635303333653631396639
+39303737613361653862343964303231393164346134633366633262326230643137303331373231
+31323832363937663935333737613133323265323863623933633962633230386339636432643937
+66653763376663666637353738646565343835333937343765356539383734316231623466343634
+30663135663938393561333133663737653635393432333534306466366332333338
--- a/settings.yml
+++ b/settings.yml
@ -1,4 +1,7 @@
 ---
+
+- configure_networks: "True"
+# Allocation pool for a flat provider network.
 - allocation_pool:
    start: 172.23.128.50
    end: 172.23.128.249
@ -9,4 +12,12 @@

 - subnet_range: 172.23.128.0/24

- rsa_pub: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDStPUPXkcu81onUm/le54JCu174yXJJDsthDr96Mv8irBVBWuy5FxnaASuDpmC4QE4s0UAIg1iq/SWrr8qdBQ4OVuYFiW0S7ZJvcoKr/40Wh+T5MeltGQfmkDp6kBsfaMSo6M4tF1c8i+XgOgxb4fxHYb8mFhseztRLx6McxJJJLB0nu+T12WQ01nl0XtwD+3EsZWfxRH0KA59VHZSe3Anc5z+Fm7WU+1Vzy6/pkiIhVReI1L6VVhZsIdSu3fQK6fHQcujtfuw6RKEpisZQqnxMUviWQ98yeQXHk6Nx840WCh3vvKveEAoC4Y/UEZa1TMe6PczfUaLjaidUkpulJsP egon@egon-pc
+- global_physnet_mtu: 9000
+
+- rsa_pub: >
+    ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDStPUPXkcu81onUm/le54JCu174yXJJDsthDr9
+    6Mv8irBVBWuy5FxnaASuDpmC4QE4s0UAIg1iq/SWrr8qdBQ4OVuYFiW0S7ZJvcoKr/40Wh+T5Mel
+    tGQfmkDp6kBsfaMSo6M4tF1c8i+XgOgxb4fxHYb8mFhseztRLx6McxJJJLB0nu+T12WQ01nl0Xtw
+    D+3EsZWfxRH0KA59VHZSe3Anc5z+Fm7WU+1Vzy6/pkiIhVReI1L6VVhZsIdSu3fQK6fHQcujtfuw
+    6RKEpisZQqnxMUviWQ98yeQXHk6Nx840WCh3vvKveEAoC4Y/UEZa1TMe6PczfUaLjaidUkpulJsP
+     egon@egon-pc
--- a/site.yml
+++ b/site.yml
@ -1,15 +1,15 @@
 ---
- import_playbook: common.yml
- import_playbook: rabbitmq.yml
- import_playbook: memcached.yml
- import_playbook: mariadb.yml
- import_playbook: keystone.yml
- import_playbook: glance-controller.yml
- import_playbook: nova-controller.yml
- import_playbook: neutron-controller.yml
- import_playbook: cinder-controller.yml
- import_playbook: cinder-storage.yml
- import_playbook: nova-compute.yml
- import_playbook: horizon.yml
- import_playbook: heat.yml
- import_playbook: post-install.yml
+- include: common.yml
+- include: rabbitmq.yml
+- include: memcached.yml
+- include: mariadb.yml
+- include: keystone.yml
+- include: glance-controller.yml
+- include: nova-controller.yml
+- include: neutron-controller.yml
+- include: cinder-controller.yml
+- include: cinder-storage.yml
+- include: nova-compute.yml
+- include: horizon.yml
+- include: heat.yml
+- include: post-install.yml
--- a/58
+++ b/58
@ -1,48 +1,36 @@
 [databases]
-openstack-test05
-openstack-test06
-openstack-test07
+ansible-test
+ansible-test-2
+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
-openstack-test06
-openstack-test07
-
-[memcached]
-openstack-test05
-
-[neutron-controller]
-openstack-test05 physical_interface_mappings=provider:enp4s0f0
-
-[nova-controller]
-openstack-test05
-
-[cinder-controller]
-openstack-test05
-
-[heat]
-openstack-test05
+ansible-test
+ansible-test-2
+ansible-test-3

 [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
+ansible-test
+
+[memcached]
+ansible-test-3
+
+[neutron-controller]
+ansible-test physical_interface_mappings=provider:ens10
+
+[nova-controller]
+ansible-test

 [nova-compute]
-openstack-test06 physical_interface_mappings=provider:enp4s0f0
-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
+ansible-test-2 physical_interface_mappings=provider:ens10
+
+[heat]
+ansible-test
Author	SHA1	Message	Date
Egon Rijpkema	1b7eb26a75	Merge branch 'feature/add-variables'	2018-04-18 10:49:09 +02:00
Egon Rijpkema	99112894be	Added mtu size variable	2018-04-18 10:46:42 +02:00
Egon Rijpkema	4e5c496862	Added configure_networks bool and mtu_size var	2018-04-16 17:07:17 +02:00
Egon Rijpkema	b4d14d0a1f	Merge branch 'develop'	2018-01-19 09:24:39 +01:00
Egon Rijpkema	c82d771d2e	Merge branch 'develop'	2018-01-19 09:18:10 +01:00