Ensure installation of same openstack client

ansible.cfg

@@ -1,3 +1,2 @@
 [defaults]
 inventory = merlin
-stdout_callback = debug

hosts-openstack03

@@ -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

merlin

@@ -1,11 +1,9 @@
 [nova-compute]
-merlin-managementnode002 physical_interface_mappings=provider:enp5s0f1.1064 overlay_ip=172.23.43.102
+merlin-managementnode002 physical_interface_mappings=provider:eno3
-merlin-managementnode003 physical_interface_mappings=provider:enp5s0f1.1064 overlay_ip=172.23.43.103
+merlin-managementnode003 physical_interface_mappings=provider:eno3
-merlin-node001 physical_interface_mappings=provider:enp130s0f0.1064 overlay_ip=172.23.43.1
+merlin-node001 physical_interface_mappings=provider:eno3
-merlin-node002 physical_interface_mappings=provider:enp130s0f0.1064 overlay_ip=172.23.43.2
+merlin-node003 physical_interface_mappings=provider:eno3
-merlin-node003 physical_interface_mappings=provider:enp130s0f0.1064 overlay_ip=172.23.43.3
+merlin-node004 physical_interface_mappings=provider:eno3
-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
@@ -30,24 +28,10 @@ merlin-managementnode001
 merlin-managementnode001
 
 [neutron-controller]
-merlin-managementnode001 physical_interface_mappings=provider:enp5s0f1.1064 overlay_ip=172.23.43.101 
+merlin-managementnode001 physical_interface_mappings=provider:eno3
 
 [heat]
 merlin-managementnode001
 
 [glance-controller]
-merlin-managementnode002
+merlin-managementnode001
-
-[cinder-controller]
-merlin-managementnode002
-
-[cinder-storage]
-merlin-managementnode002 
-merlin-managementnode003 
-merlin-node001 
-merlin-node002 
-merlin-node003 
-merlin-node004 
-merlin-node005 
-
-

merlinsdn

@@ -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

nuke.yml

@@ -14,3 +14,8 @@
     - 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"

post-install.yml

@@ -16,7 +16,10 @@
       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
         - 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/files/ceph.client.volumes.keyring

@@ -1,9 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39313161646365373665646331613930316437363735326262376531636166346138303139613138
-3361353633616136303365646165643339333130393031380a373934636436626336326436306666
-34316532333165346139633239313930326238333134633365666138326338386632373937343335
-3262383863653136300a393464646365623763663063303936646462313764633736613562633661
-62313961626165363761656363393538396461653936353932303137626435626161316239623338
-65656132353136656430613462663466616432643761303366396461653066616162366666356533
-39386261623861323861633739343237386266306264356436666430313531303238636235393665
-31396533306261393835

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

roles/cinder-storage/files/uuid

@@ -1 +0,0 @@
-d0db6ba7-a0c9-4da6-b0bc-aa7846325333

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']) }}"
@@ -39,7 +36,6 @@
   with_items:
       - /srv/cinder-storage
       - /srv/cinder-storage/root
-      - /srv/cinder-storage/etc/ceph
 
 - name: initial setup
   command: >
@@ -47,22 +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

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 }}

roles/common/tasks/main.yml

@@ -10,13 +10,13 @@
 - name: common | install packages
   apt: pkg={{ item }} state=latest update_cache=yes
   with_items:
-    - curl
+     - curl
-    - htop
+     - htop
-    - molly-guard
+     - molly-guard
-    - sudo
+     - sudo
-    - tree
+     - tree
-    - vim
+     - vim
-    - python-simplejson
+     - 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

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

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

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'] }}"
@@ -20,11 +20,10 @@
         -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"
         -e "RABBIT_USER=openstack"
 
-
+- name: pull docker image
-#- name: pull docker image
+  docker_image:
-#  docker_image:
+    name: "{{ docker_image }}"
-#    name: "{{ docker_image }}"
+  tags: pull
-#  tags: pull
 
 - name: Make build and persistent directories
   file:
@@ -34,19 +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: install service file.
   template:

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 }}
 

roles/keystone/tasks/main.yml

@@ -94,8 +94,7 @@
   retries: 7
   delay: 3
 
-
+- name: install openstack repo host key.
-- name: install openstack repo key host.
   command: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5EDB1B62EC4926EA
   tags: openstackclient
 

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
-

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:
@@ -29,7 +29,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'] }}"

roles/nova-compute/files/ceph.client.nova.keyring

@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35383561643837376265356534363538386266646466313034383231313261343566626338613433
-3464373930663738316366383835336235636137356431390a626334343661353733616366633963
-33306166646465356531666364656236633766653639393636396234663538373136373266353136
-3433626231323638300a306437383862316463363533373131343561303934326135663532656630
-38616139373964313963326539346338353664613035633436326433343835343030653936363836
-65313537623937663438663734323265323634376238373761626236353665613931616566306536
-343334346138313539333338336663343863

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

roles/nova-compute/files/uuid

@@ -1 +0,0 @@
-b5044271-1918-4070-822c-f19ed14d7494

roles/nova-compute/tasks/ceph.conf

@@ -1,2 +0,0 @@
-[client.nova]
-keyring = /etc/ceph/ceph.client.nova.keyring

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

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

@@ -26,7 +26,6 @@ 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']) }}" \
@@ -40,7 +39,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
 

site.yml

@@ -12,4 +12,4 @@
 - include: nova-compute.yml
 - include: horizon.yml
 - include: heat.yml
-  #- include: post-install.yml
+- include: post-install.yml