Added mtu size variable

Added configure_networks bool and mtu_size var
Merge branch 'develop'
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
34 changed files with 126 additions and 445 deletions
--- a/ansible.cfg
+++ b/ansible.cfg
@ -1,5 +1,2 @@
 [defaults]
-inventory = merlin
-stdout_callback = debug
-vault_password_file = .vault_pass.txt
-forks = 20
+hostfile = hosts
--- a/groupvars/all.yml
+++ b/groupvars/all.yml
@ -1,9 +0,0 @@
---
-use_ceph: true
-ceph_mon_initial_members:
-ceph_mon_host:
-ceph_public_network:
-ceph_osd_pool_default_size:
-ceph_compute_client_keyring:
-ceph_cinder_client_keyring:
-ceph_images_client_keyring:
--- a/26
+++ b/26
@ -1,26 +0,0 @@
-[databases]
-openstack03.gcc.rug.nl
-
-[keystone]
-openstack03.gcc.rug.nl
-
-[glance-controller]
-openstack03.gcc.rug.nl
-
-[horizon]
-openstack03.gcc.rug.nl
-
-[rabbitmq]
-openstack03.gcc.rug.nl
-
-[memcached]
-openstack03.gcc.rug.nl
-
-[neutron-controller]
-openstack03.gcc.rug.nl
-
-[nova-controller]
-openstack03.gcc.rug.nl
-
-[nova-compute]
-openstack03.gcc.rug.nl
--- a/54
+++ b/54
@ -1,54 +0,0 @@
-[nova-compute]
-merlin-managementnode002 physical_interface_mappings=provider:enp5s0f1.1064 overlay_ip=172.23.43.102
-merlin-managementnode003 physical_interface_mappings=provider:enp5s0f1.1064 overlay_ip=172.23.43.103
-merlin-node001 physical_interface_mappings=provider:enp130s0f0.1064 overlay_ip=172.23.43.1
-merlin-node002 physical_interface_mappings=provider:enp130s0f0.1064 overlay_ip=172.23.43.2
-merlin-node003 physical_interface_mappings=provider:enp130s0f0.1064 overlay_ip=172.23.43.3
-merlin-node004 physical_interface_mappings=provider:enp130s0f0.1064 overlay_ip=172.23.43.4
-merlin-node005 physical_interface_mappings=provider:enp130s0f0.1064 overlay_ip=172.23.43.5
-
-[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:enp5s0f1.1064 overlay_ip=172.23.43.101
-
-[heat]
-merlin-managementnode001
-
-[glance-controller]
-merlin-managementnode002
-
-[cinder-controller]
-merlin-managementnode002
-
-[cinder-storage]
-merlin-managementnode002
-merlin-managementnode003
-merlin-node001
-merlin-node002
-merlin-node003
-merlin-node004
-merlin-node005
-
-[stor]
-merlin-stor00[1:8]
--- 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,16 +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"
-
--- a/post-install.yml
+++ b/post-install.yml
@ -16,8 +16,24 @@
      command: docker exec -i keystone.service bash -c "source /root/admin-openrc.sh && {{ item }}"
      with_items:
        - openstack network create  --share --external  --provider-physical-network provider  --provider-network-type flat provider
-        - openstack network set --external provider
+        - >
+            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/files/ceph.client.volumes.keyring
+++ b/roles/cinder-storage/files/ceph.client.volumes.keyring
@ -1,9 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39313161646365373665646331613930316437363735326262376531636166346138303139613138
-3361353633616136303365646165643339333130393031380a373934636436626336326436306666
-34316532333165346139633239313930326238333134633365666138326338386632373937343335
-3262383863653136300a393464646365623763663063303936646462313764633736613562633661
-62313961626165363761656363393538396461653936353932303137626435626161316239623338
-65656132353136656430613462663466616432643761303366396461653066616162366666356533
-39386261623861323861633739343237386266306264356436666430313531303238636235393665
-31396533306261393835
--- a/roles/cinder-storage/files/ceph.conf
+++ b/roles/cinder-storage/files/ceph.conf
@ -1,14 +0,0 @@
-[global]
-fsid = ef0b40a2-bc8c-4432-9cde-0ca7c82c8717
-mon_initial_members = merlin-managementnode002
-mon_host = 172.23.59.102
-auth_cluster_required = cephx
-auth_service_required = cephx
-auth_client_required = cephx
-
-# Your network address
-public network = 172.23.59.0/24
-osd pool default size = 2
-
-[client.volumes]
-keyring = /etc/ceph/ceph.client.volumes.keyring
--- a/roles/cinder-storage/files/uuid
+++ b/roles/cinder-storage/files/uuid
@ -1 +0,0 @@
-d0db6ba7-a0c9-4da6-b0bc-aa7846325333
--- a/roles/cinder-storage/tasks/main.yml
+++ b/roles/cinder-storage/tasks/main.yml
@ -6,11 +6,8 @@
    name: secrets
  tags: vars

-#- command: uuidgen
-#  register: uuid
-
 - set_fact:
-    docker_image: registry.webhosting.rug.nl/hpc/openstack-cinder-storage-merlin:latest
+    docker_image: registry.webhosting.rug.nl/hpc/openstack-cinder-storage:latest
    env_vars: >
        -e "MY_IP={{ listen_ip | default(ansible_default_ipv4.address) }}"
        -e "CINDER_HOST={{ listen_ip | default(hostvars[groups['cinder-storage'][0]]['ansible_default_ipv4']['address']) }}"
@ -24,11 +21,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"
-        -e "USE_CEPH={{ use_ceph }}"
-        -e "MON_INITIAL_MEMBERS={{ ceph_mon_initial_members }}"
-        -e "MON_HOST={{ ceph_mon_host }}"
-        -e "PUBLIC_NETWORK={{ ceph_public_network }}"
-        -e "OSD_POOL_DEFAULT_SIZE={{ ceph_osd_pool_default_size }}"
  tags: vars

 - name: pull docker image
@ -42,9 +34,8 @@
    state: directory
    mode: 0777
  with_items:
-    - /srv/cinder-storage
-    - /srv/cinder-storage/root
-    - /srv/cinder-storage/etc/ceph
+      - /srv/cinder-storage
+      - /srv/cinder-storage/root

 - name: initial setup
  command: >
@ -52,21 +43,10 @@
             --privileged
             {{ env_vars }}
             -v /srv/cinder-storage/root:/root \
+             -v "{{ storage_volume }}":/dev/cinder_storage_volume \
             {{ docker_image }} /etc/bootstrap.sh
  tags: bootstrap

- name: copy ceph-client configurationfile
-  copy:
-    src: files/ceph.conf
-    dest: /srv/cinder-storage/etc/ceph/ceph.conf
-    mode: 0644
-
- name: copy ceph-client-keyring
-  copy:
-    src: files/ceph.client.volumes.keyring
-    dest: /srv/cinder-storage/etc/ceph/ceph.client.volumes.keyring
-    mode: 0644
-
 - name: install service file.
  template:
    src: templates/cinder-storage.service
@ -76,12 +56,6 @@
    group: root
  tags: systemd

- name: set ceph client keyring
-  copy:
-    content: "{{ceph_cinder_client_keyring}}"
-    dest: /srv/cinder-storage/etc/ceph
-  when: use_ceph
-
 - command: systemctl daemon-reload
  tags: systemd

--- a/roles/cinder-storage/templates/cinder-storage.service
+++ b/roles/cinder-storage/templates/cinder-storage.service
@ -11,8 +11,11 @@ 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 /srv/cinder-storage/etc/ceph:/etc/ceph \
+  -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 }}
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@ -10,13 +10,13 @@
 - name: common | install packages
  apt: pkg={{ item }} state=latest update_cache=yes
  with_items:
-    - curl
-    - htop
-    - molly-guard
-    - sudo
-    - tree
-    - vim
-    - python-simplejson
+     - curl
+     - htop
+     - molly-guard
+     - sudo
+     - tree
+     - vim
+     - python-simplejson

 - name: sshd_config
  file:
@ -26,7 +26,4 @@
    owner: root
    group: root

- name: disable apparmor
-  apt: pkg=apparmor state=absent
-
 - include: docker.yml
--- a/roles/glance-controller/files/ceph.client.images.keyring
+++ b/roles/glance-controller/files/ceph.client.images.keyring
@ -1,9 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-38396565316335323234336366643364636639306234383033383664383131343861326231633437
-3164323532393735663065313036316664623065383466310a393665393238323265316464393338
-35303535306434363538303032323366353138303363386463313364313864663535386138323634
-3138393163353063650a386532356566396636636365343065343934396163663732663965343038
-63343539643964656538396664633235636639356532616530613838613839623830396565656538
-62613236643632346539613036383230653431643733343737626666633532613030366462326430
-63303339373563366633363130363361643731303030323635323832333165363439623831316636
-64613533313664383164
--- a/roles/glance-controller/files/ceph.conf
+++ b/roles/glance-controller/files/ceph.conf
@ -1,14 +0,0 @@
-[global]
-fsid = ef0b40a2-bc8c-4432-9cde-0ca7c82c8717
-mon_initial_members = merlin-managementnode002
-mon_host = 172.23.59.102
-auth_cluster_required = cephx
-auth_service_required = cephx
-auth_client_required = cephx
-
-# Your network address
-public network = 172.23.59.0/24
-osd pool default size = 2
-
-[client.images]
-keyring = /etc/ceph/ceph.client.images.keyring
--- a/roles/glance-controller/tasks/main.yml
+++ b/roles/glance-controller/tasks/main.yml
@ -6,7 +6,7 @@
    name: secrets

 - set_fact:
-    docker_image: registry.webhosting.rug.nl/hpc/openstack-glance-merlin:latest
+    docker_image: registry.webhosting.rug.nl/hpc/openstack-glance:latest
    env_vars: >
        -e "GLANCE_HOST={{ listen_ip | default(hostvars[groups['glance-controller'][0]]['ansible_default_ipv4']['address']) }}"
        -e "GLANCE_PASSWORD={{ secrets['GLANCE_PASSWORD'] }}"
@ -19,16 +19,11 @@
        -e "RABBIT_HOST={{ listen_ip | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}"
        -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"
        -e "RABBIT_USER=openstack"
-        -e "USE_CEPH={{ use_ceph }}"
-        -e "MON_INITIAL_MEMBERS={{ ceph_mon_initial_members }}"
-        -e "MON_HOST={{ ceph_mon_host }}"
-        -e "PUBLIC_NETWORK={{ ceph_public_network }}"
-        -e "OSD_POOL_DEFAULT_SIZE={{ ceph_osd_pool_default_size }}"

-#- name: pull docker image
-#  docker_image:
-#    name: "{{ docker_image }}"
-#  tags: pull
+- name: pull docker image
+  docker_image:
+    name: "{{ docker_image }}"
+  tags: pull

 - name: Make build and persistent directories
  file:
@ -38,25 +33,6 @@
  with_items:
      - /srv/glance
      - /srv/glance/root
-      - /srv/glance/etc/ceph
-
- name: copy ceph-client configurationfile
-  copy:
-    src: files/ceph.conf
-    dest: /srv/glance/etc/ceph/ceph.conf
-    mode: 0644
-
- name: copy ceph-client-keyring
-  copy:
-    src: files/ceph.client.images.keyring
-    dest: /srv/glance/etc/ceph/ceph.client.volumes.keyring
-    mode: 0644
-
- name: set ceph client keyring
-  copy:
-    content: "{{ceph_images_client_keyring}}"
-    dest: /srv/cinder-storage/etc/ceph/ceph.client.images.keyring
-  when: use_ceph

 - name: install service file.
  template:
--- a/roles/glance-controller/templates/glance.service
+++ b/roles/glance-controller/templates/glance.service
@ -11,7 +11,7 @@ ExecStartPre=-/usr/bin/docker rm %n
 ExecStart=/usr/bin/docker run --name %n \
  {{ env_vars | replace('\n', '') }} \
  -v /srv/glance/root:/root \
-  -v /etc/ceph:/etc/ceph \
+  -v /var/lib/glance/images:/var/lib/glance/images \
  -p 9292:9292 \
  {{ docker_image }}

--- 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,19 +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 key host.
-  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/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@ -70,8 +70,3 @@

 - 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: groups['databases'] | length >= 3
-
--- a/roles/neutron-controller/tasks/main.yml
+++ b/roles/neutron-controller/tasks/main.yml
@ -6,7 +6,7 @@
    name: secrets

 - set_fact:
-    docker_image: "registry.webhosting.rug.nl/hpc/openstack-neutron-controller-merlin:latest"
+    docker_image: "registry.webhosting.rug.nl/hpc/openstack-neutron-controller:latest"

 - name: pull docker image
  docker_image:
@ -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'] }}"
@ -29,7 +30,6 @@
        -e "NOVA_CONTROLLER_HOST={{ listen_ip | default(hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address']) }}"
        -e "NOVA_PLACEMENT_PASSWORD={{ secrets['NOVA_PLACEMENT_PASSWORD'] }}"
        -e "NOVA_PLACEMENT_USER=placement"
-        -e "OVERLAY_IP={{ overlay_ip }}"
        -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}"
        -e "PHYSICAL_INTERFACE_MAPPINGS={{ physical_interface_mappings }}"
        -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"
--- a/roles/nova-compute/files/ceph.client.nova.keyring
+++ b/roles/nova-compute/files/ceph.client.nova.keyring
@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35383561643837376265356534363538386266646466313034383231313261343566626338613433
-3464373930663738316366383835336235636137356431390a626334343661353733616366633963
-33306166646465356531666364656236633766653639393636396234663538373136373266353136
-3433626231323638300a306437383862316463363533373131343561303934326135663532656630
-38616139373964313963326539346338353664613035633436326433343835343030653936363836
-65313537623937663438663734323265323634376238373761626236353665613931616566306536
-343334346138313539333338336663343863
--- a/roles/nova-compute/files/ceph.conf
+++ b/roles/nova-compute/files/ceph.conf
@ -1,14 +0,0 @@
-[global]
-fsid = ef0b40a2-bc8c-4432-9cde-0ca7c82c8717
-mon_initial_members = merlin-managementnode002
-mon_host = 172.23.59.102
-auth_cluster_required = cephx
-auth_service_required = cephx
-auth_client_required = cephx
-
-# Your network address
-public network = 172.23.59.0/24
-osd pool default size = 2
-
-[client.nova]
-keyring = /etc/ceph/ceph.client.nova.keyring
--- a/roles/nova-compute/files/uuid
+++ b/roles/nova-compute/files/uuid
@ -1 +0,0 @@
-b5044271-1918-4070-822c-f19ed14d7494
--- a/roles/nova-compute/tasks/ceph.conf
+++ b/roles/nova-compute/tasks/ceph.conf
@ -1,2 +0,0 @@
-[client.nova]
-keyring = /etc/ceph/ceph.client.nova.keyring
--- a/roles/nova-compute/tasks/main.yml
+++ b/roles/nova-compute/tasks/main.yml
@ -7,7 +7,7 @@
  tags: vars

 - set_fact:
-    docker_image: registry.webhosting.rug.nl/hpc/openstack-nova-compute-merlin:latest
+    docker_image: registry.webhosting.rug.nl/hpc/openstack-nova-compute:latest
  tags: vars

 - name: pull docker image
@ -16,27 +16,6 @@
    force: True
  tags: pull

- name: Make build and persistent directories
-  file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0777
-  with_items:
-    - /srv/nova-compute
-    - /srv/nova-compute/etc/ceph
-
- name: copy ceph-client configurationfile
-  copy:
-    src: files/ceph.conf
-    dest: /srv/nova-compute/etc/ceph/ceph.conf
-    mode: 0644
-
- name: copy ceph-client-keyring
-  copy:
-    src: files/ceph.client.nova.keyring
-    dest: /srv/nova-compute/etc/ceph/ceph.client.nova.keyring
-    mode: 0644
-
 - name: install service file.
  template:
    src: templates/nova-compute.service
@ -46,22 +25,16 @@
    group: root
  tags: systemd

- name: set ceph client keyring
-  copy:
-    content: "{{ceph_compute_client_keyring}}"
-    dest: /srv/nova-compute/etc/ceph
-  when: use_ceph
-
 - command: systemctl daemon-reload
  tags: systemd

 - apt:
    name: "{{ item }}"
  with_items:
-    - kvm
-    - libvirt0
-    - libvirt-bin
-    - qemu
+      - kvm
+      - libvirt0
+      - libvirt-bin
+      - qemu

 - name: make sure service is started
  systemd:
--- 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']) }}" \
@ -26,17 +28,11 @@ ExecStart=/usr/bin/docker run --name %n \
    -e "NOVA_PLACEMENT_PASSWORD={{ secrets['NOVA_PLACEMENT_PASSWORD'] }}" \
    -e "NOVA_PLACEMENT_USER=placement" \
    -e "NOVA_USER=nova" \
-    -e "OVERLAY_IP={{ overlay_ip }}" \
    -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}" \
    -e "PHYSICAL_INTERFACE_MAPPINGS={{ physical_interface_mappings }}" \
    -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 "USE_CEPH={{ use_ceph }}" \
-    -e "MON_INITIAL_MEMBERS={{ ceph_mon_initial_members }}" \
-    -e "MON_HOST={{ ceph_mon_host }}" \
-    -e "PUBLIC_NETWORK={{ ceph_public_network }}" \
-    -e "OSD_POOL_DEFAULT_SIZE={{ ceph_osd_pool_default_size }}" \
    --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 \
@ -45,7 +41,6 @@ ExecStart=/usr/bin/docker run --name %n \
    -v /var/lib/nova/instances:/var/lib/nova/instances \
    -v /lib/modules:/lib/modules \
    -v /etc/machine-id:/etc/machine-id \
-    -v /srv/nova-compute/etc/ceph:/etc/ceph \
    --network host \
    {{ docker_image }} /etc/run.sh

--- a/secrets.yml
+++ b/secrets.yml
@ -1,34 +1,30 @@
 $ANSIBLE_VAULT;1.1;AES256
-62326337613938653661303066636362626639393334643233386166383735653137643761653939
-6337383561386130346461373262626235353061393737650a336265653035656135643530393430
-65623533323531393731323765333530386666636531363263393332356137333964653761616265
-3566623031616538630a353265333633643030663735626338646563663938363664313930313037
-62356665316534353433656362303836613365643263343462646366623062656335333366373836
-65363363633636633262663063346231333865316237646164373637396130383563666665333339
-61313632663862626532333364643962383365633361326430353734393134373130666565383361
-31303864343132306264356462613234396166613436646130303761396361613937653334373337
-62393538366665386131646162316134393532396530653264323230633166656632346365323634
-33383337613866333031376461396633336233363565316362386566643262333933643237636234
-35616436383238373661313038343063383332303765316232376635346431336161373065656137
-61313962383634396136616663383566663836613939373932323263616461646531633332386436
-34633761666634363062313563646162346330316363323539343439346434306465626130376632
-34336365656231623836643736653037636635613432333435623461613361653031643433326336
-64646664366437393436623832623138306334353634313038656364353866643039663135363932
-34663361373833626461363165646566666332336636653939616438316265393861326636653134
-65373035396635613039333730363863383039323432623432656639346230366461663565613639
-66653335326337306634626335636439343966376336633834356437323866616132316632333230
-63663532396630666434353932363738666134656262363933633635626430373966646234366435
-39353465333133653932303166346339343465383835353861306363386632353432353262333365
-32316565663161326238613834613761316336326662643532353966616630656263666463386264
-63353037373234663237366433623737356364363932353030646531343033643930343465383465
-64343736386433326230383339666364666664323833626239333865373437393365623331303436
-66313063616336303733306462346133623135386535313665623566326138333132353031333930
-65323436653833393639633462343664346165346538613435323231303263303038326135613433
-33666434303963346436643937653934666336396130356639326439306565613432323734383930
-37616536303038343865343637316430343339616162373232653735373335343765333033663030
-32623434376337623665386639396262326236353130313735336264383631333233383034623133
-66376138336465313431346166346638306631333161373165396437653438323931626230633436
-63313831636132386664353339653331333530633731383738616136316636616136383531303064
-39633232396131336535343263313338376334663337626539316263353038623565383062383639
-64393130353462633865653734323637346436363336393734373263313332633562643732326663
-3437
+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
@ -12,4 +12,4 @@
 - include: nova-compute.yml
 - include: horizon.yml
 - include: heat.yml
-  #- include: post-install.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
--- a/ubuntucloudrepo.yml
+++ b/ubuntucloudrepo.yml
@ -1,18 +0,0 @@
---
- hosts: all
-  name: Dummy to gather facts
-  become: true
-  tasks:
-
-      - name: install openstack repo key host.
-        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
-
-      - apt:
-          update_cache: yes
Author	SHA1	Message	Date
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