Shouldn't be here in the first place.

test cluster for bagpipe
2018-04-09 15:56:52 +02:00 · 2018-03-23 11:37:47 +01:00
20 changed files with 45 additions and 213 deletions
--- a/gcc-site.yml
+++ b/gcc-site.yml
@@ -1,14 +0,0 @@
---
- 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/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,53 +1,39 @@
 [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
+merlin-node012 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.12
+merlin-node013 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.13
+merlin-node006 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.6
+merlin-node007 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.7
+merlin-node008 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.8
+merlin-node009 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.9
+merlin-node010 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.10

 [databases]
-merlin-managementnode001
-merlin-managementnode002
-merlin-managementnode003
+merlin-node011
+merlin-node012
+merlin-node013

 [rabbitmq]
-merlin-managementnode001
-merlin-managementnode002
-merlin-managementnode003
+merlin-node011
+merlin-node012
+merlin-node013

 [horizon]
-merlin-managementnode001
+merlin-node011

 [memcached]
-merlin-managementnode001
+merlin-node011

 [nova-controller]
-merlin-managementnode001
+merlin-node011

 [keystone]
-merlin-managementnode001
+merlin-node011

 [neutron-controller]
-merlin-managementnode001 physical_interface_mappings=provider:enp5s0f1.1064 overlay_ip=172.23.43.101 
+merlin-node011 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.11

 [heat]
-merlin-managementnode001
+merlin-node011

 [glance-controller]
-merlin-managementnode002
-
-[cinder-controller]
-merlin-managementnode002
-
-[cinder-storage]
-merlin-managementnode002 
-merlin-managementnode003 
-merlin-node001 
-merlin-node002 
-merlin-node003 
-merlin-node004 
-merlin-node005 
-
-
+merlin-node011
--- a/14
+++ b/14
@@ -1,9 +1,11 @@
 [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
+merlin-managementnode002 physical_interface_mappings=provider:enp5s0f1 overlay_ip=129.125.60.109
+merlin-managementnode003 physical_interface_mappings=provider:enp5s0f1 overlay_ip=129.125.60.110
+merlin-node001 physical_interface_mappings=provider:enp130s0f0 overlay_ip=129.125.60.117
+merlin-node002 physical_interface_mappings=provider:enp130s0f0 overlay_ip=129.125.60.118
+merlin-node003 physical_interface_mappings=provider:enp130s0f0 overlay_ip=129.125.60.119
+merlin-node004 physical_interface_mappings=provider:enp130s0f0 overlay_ip=129.125.60.122
+merlin-node005 physical_interface_mappings=provider:enp130s0f0 overlay_ip=129.125.60.123

 [databases]
 merlin-managementnode001
@@ -28,7 +30,7 @@ merlin-managementnode001
 merlin-managementnode001

 [neutron-controller]
-merlin-managementnode001 physical_interface_mappings=provider:eno3
+merlin-managementnode001 physical_interface_mappings=provider:enp5s0f1 overlay_ip=129.125.60.108

 [heat]
 merlin-managementnode001
--- a/nuke.yml
+++ b/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"
--- 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']) }}"
@@ -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
--- 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/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'] }}"
@@ -20,11 +20,10 @@
        -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"
        -e "RABBIT_USER=openstack"

-
-#- 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:
@@ -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:
--- 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/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
@@ -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
--- a/roles/nova-compute/templates/nova-compute.service
+++ b/roles/nova-compute/templates/nova-compute.service
@@ -40,7 +40,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
Author	SHA1	Message	Date
Egon Rijpkema	6453f1c468	Shouldn't be here in the first place.	2018-04-09 15:56:52 +02:00
Egon Rijpkema	3001fb8d57	test cluster for bagpipe	2018-03-23 11:37:47 +01:00