Deploy pg from our repo

kelvich · kelvich · commit 1e510fd08a29 · 2015-11-06T03:02:30.000+03:00
diff --git a/tests/deploy/roles/postgres/tasks/main.yml b/tests/deploy/roles/postgres/tasks/main.yml
@@ -31,79 +31,65 @@
   sudo: yes
 
 - name: clone postgres sources
-  git: repo=git://git.postgresql.org/git/postgresql.git
+  git: repo={{pg_repo}}
     dest={{pg_src}}
     version={{pg_version_tag}}
-    force=yes
-    update=yes
     depth=1
     accept_hostkey=True
   register: pg_sources
 
-- name: upload patches
-  get_url: "url={{pg_patch}} dest={{pg_src}}/p1.patch"
-  # when: pg_sources.before != pg_sources.after
-
-- name: patch postgres
-  patch: >
-    src={{pg_src}}/p1.patch
-    basedir={{pg_src}}
-    remote_src=True
-    strip=1
-
-
 #############################################################################
 
-# - stat: path={{pg_datadir}}/postmaster.pid
-#   register: pg_pidfile
-
-# - name: stop postgres if it was running
-#   command: "{{pg_dst}}/bin/pg_ctl stop -w -D {{pg_datadir}}"
-#   when: pg_pidfile.stat.exists
-
-# - name: force rebuild on changed sources
-#   command: "rm {{pg_dst}}/bin/postgres"
-#   when: pg_sources.changed
-
-# - name: build and install
-#   shell: ./configure --prefix={{pg_dst}} --without-zlib && make clean && make -j {{makejobs}} && make install
-#   args:
-#     chdir: "{{pg_src}}"
-#     creates: "{{pg_dst}}/bin/postgres"
-
-# - name: remove datadirs on datanodes
-#   command: "rm -rf {{pg_datadir}}"
-#   when: pg_destroy_and_init
-
-# - name: create datadirs on datanodes
-#   command: "{{pg_dst}}/bin/initdb {{pg_datadir}}"
-#   args:
-#     creates: "{{pg_datadir}}"
-
-# - name: configure postgres on datanodes
-#   lineinfile:
-#     dest: "{{pg_datadir}}/postgresql.conf"
-#     line: "{{item.line}}"
-#     state: present
-#   with_items: "{{pg_config}}"
-
-# - name: configure postgres on datanodes -- 2
-#   lineinfile:
-#     dest: "{{pg_datadir}}/postgresql.conf"
-#     line: "{{item.line}}"
-#     state: present
-#   with_items: "{{pg_config_role}}"
-
-# - name: enable blind trust on datanodes
-#   lineinfile:
-#     dest: "{{pg_datadir}}/pg_hba.conf"
-#     line: "host all all 0.0.0.0/0 trust"
-
-# # - include: pg_shard.yml
-# #   when: deploy_pg_shard
-
-# - name: start postgrespro
-#   command: "{{pg_dst}}/bin/pg_ctl start -w -D {{pg_datadir}} -l {{pg_datadir}}/pg.log"
+- stat: path={{pg_datadir}}/postmaster.pid
+  register: pg_pidfile
+
+- name: stop postgres if it was running
+  command: "{{pg_dst}}/bin/pg_ctl stop -w -D {{pg_datadir}}"
+  when: pg_pidfile.stat.exists
+
+- name: force rebuild on changed sources
+  command: "rm {{pg_dst}}/bin/postgres"
+  when: pg_sources.changed
+
+- name: build and install
+  shell: ./configure --prefix={{pg_dst}} --without-zlib && make clean && make -j {{makejobs}} && make install
+  args:
+    chdir: "{{pg_src}}"
+    creates: "{{pg_dst}}/bin/postgres"
+
+- name: remove datadirs on datanodes
+  command: "rm -rf {{pg_datadir}}"
+  when: pg_destroy_and_init
+
+- name: create datadirs on datanodes
+  command: "{{pg_dst}}/bin/initdb {{pg_datadir}}"
+  args:
+    creates: "{{pg_datadir}}"
+
+- name: configure postgres on datanodes
+  lineinfile:
+    dest: "{{pg_datadir}}/postgresql.conf"
+    line: "{{item.line}}"
+    state: present
+  with_items: "{{pg_config}}"
+
+- name: configure postgres on datanodes -- 2
+  lineinfile:
+    dest: "{{pg_datadir}}/postgresql.conf"
+    line: "{{item.line}}"
+    state: present
+  with_items: "{{pg_config_role}}"
+
+- name: enable blind trust on datanodes
+  lineinfile:
+    dest: "{{pg_datadir}}/pg_hba.conf"
+    line: "host all all 0.0.0.0/0 trust"
+
+# - include: pg_shard.yml
+#   when: deploy_pg_shard
+
+- name: start postgrespro
+  command: "{{pg_dst}}/bin/pg_ctl start -w -D {{pg_datadir}} -l {{pg_datadir}}/pg.log"
 
 
 
diff --git a/tests/deploy/roles/postgres/vars/main.yml b/tests/deploy/roles/postgres/vars/main.yml
@@ -6,9 +6,13 @@ deploy_postgres: false
 deploy_dtm: false
 deploy_pg_shard: false
 
+pg_repo: git://git.postgresql.org/git/postgresql.git
+pg_version_tag: master
+
+
 pg_destroy_and_init: false
 
-pg_version_tag: master
+
 pg_port: 5432
 pg_dtm_enable: false
 pg_dtm_host: "127.0.0.1"
diff --git a/tests/deploy/tsdm.yml b/tests/deploy/tsdm.yml
@@ -6,17 +6,17 @@
 
   - role: postgres
     pg_port: 15432
-    pg_version_tag: REL9_5_BETA1
+    pg_repo: https://github.com/kelvich/postgresql.git
+    pg_version_tag: xtm_patched
     pg_destroy_and_init: true
     pg_datadir: ./postgrespro-data
-    pg_patch: https://raw.githubusercontent.com/postgrespro/pg_dtm/master/xtm.patch
 
   - role: postgres
     pg_port: 15433
-    pg_version_tag: REL9_5_BETA1
+    pg_repo: https://github.com/kelvich/postgresql.git
+    pg_version_tag: xtm_patched
     pg_destroy_and_init: true
     pg_datadir: ./postgrespro-data2
-    pg_patch: https://raw.githubusercontent.com/postgrespro/pg_dtm/master/xtm.patch
 
   tasks:
 
@@ -28,7 +28,7 @@
     register: dtm_sources
 
   - name: build dtm
-    shell: "PG_CONFIG={{pg_dst}}/bin/pg_config && make clean && make -j {{makejobs}} install"
+    shell: "PG_CONFIG={{pg_dst}}/bin/pg_config make -j {{makejobs}} install"
     args:
       chdir: ./pg_tsdtm
     when: dtm_sources.changed
@@ -40,7 +40,8 @@
       line: "shared_preload_libraries = 'pg_dtm'"
       state: present
 
-  - name: start postgrespro
-    command: "{{pg_dst}}/bin/pg_ctl restart -w -D {{pg_datadir}} -l {{pg_datadir}}/pg.log"
-
+  - name: restart postgrespro1
+    command: "{{pg_dst}}/bin/pg_ctl restart -w -D ./postgrespro-data -l ./postgrespro-data/pg.log"
 
+  - name: restart postgrespro2
+    command: "{{pg_dst}}/bin/pg_ctl restart -w -D ./postgrespro-data -l ./postgrespro-data/pg.log"
