From 7aeadcf61aef6256962a4859f4753b69c8fccc0f Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Wed, 29 Jul 2015 16:46:00 -0400
Subject: Set loglevel=2 as our default across the board
---
playbooks/aws/openshift-cluster/config.yml | 2 +-
playbooks/byo/openshift-cluster/config.yml | 2 +-
playbooks/gce/openshift-cluster/config.yml | 2 +-
playbooks/libvirt/openshift-cluster/config.yml | 2 +-
playbooks/openstack/openshift-cluster/config.yml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'playbooks')
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml
index 8106d5da9..a8e3e27bb 100644
--- a/playbooks/aws/openshift-cluster/config.yml
+++ b/playbooks/aws/openshift-cluster/config.yml
@@ -17,7 +17,7 @@
g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"
g_nodeonmaster: true
openshift_cluster_id: "{{ cluster_id }}"
- openshift_debug_level: 4
+ openshift_debug_level: 2
openshift_deployment_type: "{{ deployment_type }}"
openshift_hostname: "{{ ec2_private_ip_address }}"
openshift_public_hostname: "{{ ec2_ip_address }}"
diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml
index 2ee1d50a7..9e50a4a18 100644
--- a/playbooks/byo/openshift-cluster/config.yml
+++ b/playbooks/byo/openshift-cluster/config.yml
@@ -5,5 +5,5 @@
g_masters_group: "{{ 'masters' }}"
g_nodes_group: "{{ 'nodes' }}"
openshift_cluster_id: "{{ cluster_id | default('default') }}"
- openshift_debug_level: 4
+ openshift_debug_level: 2
openshift_deployment_type: "{{ deployment_type }}"
diff --git a/playbooks/gce/openshift-cluster/config.yml b/playbooks/gce/openshift-cluster/config.yml
index 219ebe6a0..fd5dfcc72 100644
--- a/playbooks/gce/openshift-cluster/config.yml
+++ b/playbooks/gce/openshift-cluster/config.yml
@@ -19,6 +19,6 @@
g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}"
g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"
openshift_cluster_id: "{{ cluster_id }}"
- openshift_debug_level: 4
+ openshift_debug_level: 2
openshift_deployment_type: "{{ deployment_type }}"
openshift_hostname: "{{ gce_private_ip }}"
diff --git a/playbooks/libvirt/openshift-cluster/config.yml b/playbooks/libvirt/openshift-cluster/config.yml
index 98fe11251..c208eee81 100644
--- a/playbooks/libvirt/openshift-cluster/config.yml
+++ b/playbooks/libvirt/openshift-cluster/config.yml
@@ -20,5 +20,5 @@
g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}"
g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"
openshift_cluster_id: "{{ cluster_id }}"
- openshift_debug_level: 4
+ openshift_debug_level: 2
openshift_deployment_type: "{{ deployment_type }}"
diff --git a/playbooks/openstack/openshift-cluster/config.yml b/playbooks/openstack/openshift-cluster/config.yml
index 3c9a231e3..a5ee2d6a5 100644
--- a/playbooks/openstack/openshift-cluster/config.yml
+++ b/playbooks/openstack/openshift-cluster/config.yml
@@ -15,6 +15,6 @@
g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}"
g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"
openshift_cluster_id: "{{ cluster_id }}"
- openshift_debug_level: 4
+ openshift_debug_level: 2
openshift_deployment_type: "{{ deployment_type }}"
openshift_hostname: "{{ ansible_default_ipv4.address }}"
--
cgit v1.2.3
From 5d7753a8ecb03634f045b057dc33369178615f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pep=20Turr=C3=B3=20Mauri?= <pep@redhat.com>
Date: Sat, 1 Aug 2015 17:22:24 +0200
Subject: Deploying enterprise with Vagrant
---
playbooks/byo/vagrant.yml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 playbooks/byo/vagrant.yml
(limited to 'playbooks')
diff --git a/playbooks/byo/vagrant.yml b/playbooks/byo/vagrant.yml
new file mode 100644
index 000000000..c89f8775b
--- /dev/null
+++ b/playbooks/byo/vagrant.yml
@@ -0,0 +1,14 @@
+---
+- hosts: all
+ vars:
+ deployment_type: "{{ openshift_deployment_type }}"
+ roles:
+ - role: rhel_subscribe
+ when: openshift_deployment_type == "enterprise" and
+ ansible_distribution == "RedHat" and
+ lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
+ default('no', True) | lower in ['no', 'false']
+ - openshift_repos
+ - os_update_latest
+
+- include: config.yml
--
cgit v1.2.3
From 3548472edd08d09fafcb236790a44bcf31aa5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pep=20Turr=C3=B3=20Mauri?= <pep@redhat.com>
Date: Mon, 3 Aug 2015 16:29:25 +0200
Subject: Move rhel_subscribe tasks to its own playbook
Allows reuse out of vagrant, e.g. to subscribe systems by its own
---
playbooks/byo/rhel_subscribe.yml | 12 ++++++++++++
playbooks/byo/vagrant.yml | 12 +-----------
2 files changed, 13 insertions(+), 11 deletions(-)
create mode 100644 playbooks/byo/rhel_subscribe.yml
(limited to 'playbooks')
diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml
new file mode 100644
index 000000000..60300c3dc
--- /dev/null
+++ b/playbooks/byo/rhel_subscribe.yml
@@ -0,0 +1,12 @@
+---
+- hosts: all
+ vars:
+ deployment_type: "{{ openshift_deployment_type }}"
+ roles:
+ - role: rhel_subscribe
+ when: openshift_deployment_type == "enterprise" and
+ ansible_distribution == "RedHat" and
+ lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
+ default('no', True) | lower in ['no', 'false']
+ - openshift_repos
+ - os_update_latest
diff --git a/playbooks/byo/vagrant.yml b/playbooks/byo/vagrant.yml
index c89f8775b..76246e7b0 100644
--- a/playbooks/byo/vagrant.yml
+++ b/playbooks/byo/vagrant.yml
@@ -1,14 +1,4 @@
---
-- hosts: all
- vars:
- deployment_type: "{{ openshift_deployment_type }}"
- roles:
- - role: rhel_subscribe
- when: openshift_deployment_type == "enterprise" and
- ansible_distribution == "RedHat" and
- lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
- default('no', True) | lower in ['no', 'false']
- - openshift_repos
- - os_update_latest
+- include: rhel_subscribe.yml
- include: config.yml
--
cgit v1.2.3
From e438f0c19e86241e11853970aa7e94e90c5fffeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pep=20Turr=C3=B3=20Mauri?= <pep@redhat.com>
Date: Mon, 3 Aug 2015 16:40:06 +0200
Subject: Use deployment_type, not openshift_deployment_type
This seems to be what's used in other places
---
playbooks/byo/rhel_subscribe.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'playbooks')
diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml
index 60300c3dc..f564905ea 100644
--- a/playbooks/byo/rhel_subscribe.yml
+++ b/playbooks/byo/rhel_subscribe.yml
@@ -1,10 +1,10 @@
---
- hosts: all
vars:
- deployment_type: "{{ openshift_deployment_type }}"
+ openshift_deployment_type: "{{ deployment_type }}"
roles:
- role: rhel_subscribe
- when: openshift_deployment_type == "enterprise" and
+ when: deployment_type == "enterprise" and
ansible_distribution == "RedHat" and
lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
default('no', True) | lower in ['no', 'false']
--
cgit v1.2.3
From 65f9922028595c36eb10c8f43b4db51817d64c32 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Thu, 13 Aug 2015 16:15:44 -0400
Subject: Fix for node labeling where internal node name != inventory_hostname
---
playbooks/common/openshift-node/config.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'playbooks')
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 4010b4c9e..705f7f223 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -128,9 +128,10 @@
vars:
openshift_nodes: "{{ hostvars
| oo_select_keys(groups['oo_nodes_to_config'])
- | oo_collect('openshift.common.hostname') }}"
+ | oo_collect('openshift.common.hostname') }}"
openshift_unscheduleable_nodes: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'] | default([]))
| oo_collect('openshift.common.hostname', {'openshift_scheduleable': False}) }}"
+ openshift_node_vars: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config']) }}"
pre_tasks:
- set_fact:
openshift_scheduleable_nodes: "{{ hostvars
--
cgit v1.2.3
From 29f4037106ac8ada0955f5c1f309b5de3e0e94ea Mon Sep 17 00:00:00 2001
From: Wesley Hearn <whearn@redhat.com>
Date: Fri, 14 Aug 2015 16:09:51 -0400
Subject: Update instance sizes for online
---
playbooks/aws/openshift-cluster/vars.online.int.yml | 4 ++--
playbooks/aws/openshift-cluster/vars.online.prod.yml | 4 ++--
playbooks/aws/openshift-cluster/vars.online.stage.yml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'playbooks')
diff --git a/playbooks/aws/openshift-cluster/vars.online.int.yml b/playbooks/aws/openshift-cluster/vars.online.int.yml
index b9ee29b83..bb18e13b0 100644
--- a/playbooks/aws/openshift-cluster/vars.online.int.yml
+++ b/playbooks/aws/openshift-cluster/vars.online.int.yml
@@ -3,9 +3,9 @@ ec2_image: ami-9101c8fa
ec2_image_name: libra-ops-rhel7*
ec2_region: us-east-1
ec2_keypair: mmcgrath_libra
-ec2_master_instance_type: m4.large
+ec2_master_instance_type: t2.small
ec2_master_security_groups: [ 'integration', 'integration-master' ]
-ec2_infra_instance_type: m4.large
+ec2_infra_instance_type: c4.large
ec2_infra_security_groups: [ 'integration', 'integration-infra' ]
ec2_node_instance_type: m4.large
ec2_node_security_groups: [ 'integration', 'integration-node' ]
diff --git a/playbooks/aws/openshift-cluster/vars.online.prod.yml b/playbooks/aws/openshift-cluster/vars.online.prod.yml
index 691582834..bbef9cc56 100644
--- a/playbooks/aws/openshift-cluster/vars.online.prod.yml
+++ b/playbooks/aws/openshift-cluster/vars.online.prod.yml
@@ -3,9 +3,9 @@ ec2_image: ami-9101c8fa
ec2_image_name: libra-ops-rhel7*
ec2_region: us-east-1
ec2_keypair: mmcgrath_libra
-ec2_master_instance_type: m4.large
+ec2_master_instance_type: t2.small
ec2_master_security_groups: [ 'production', 'production-master' ]
-ec2_infra_instance_type: m4.large
+ec2_infra_instance_type: c4.large
ec2_infra_security_groups: [ 'production', 'production-infra' ]
ec2_node_instance_type: m4.large
ec2_node_security_groups: [ 'production', 'production-node' ]
diff --git a/playbooks/aws/openshift-cluster/vars.online.stage.yml b/playbooks/aws/openshift-cluster/vars.online.stage.yml
index 2ec43ad4c..9008a55ba 100644
--- a/playbooks/aws/openshift-cluster/vars.online.stage.yml
+++ b/playbooks/aws/openshift-cluster/vars.online.stage.yml
@@ -3,9 +3,9 @@ ec2_image: ami-9101c8fa
ec2_image_name: libra-ops-rhel7*
ec2_region: us-east-1
ec2_keypair: mmcgrath_libra
-ec2_master_instance_type: m4.large
+ec2_master_instance_type: t2.small
ec2_master_security_groups: [ 'stage', 'stage-master' ]
-ec2_infra_instance_type: m4.large
+ec2_infra_instance_type: c4.large
ec2_infra_security_groups: [ 'stage', 'stage-infra' ]
ec2_node_instance_type: m4.large
ec2_node_security_groups: [ 'stage', 'stage-node' ]
--
cgit v1.2.3
From 69f6fd410500a3dd20a97a9e3dad860761b09ac8 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 2 Jul 2015 11:59:22 -0400
Subject: playbooks/adhoc: Add a tutorial-reset playbook to undo everything
This makes it easier to run through the tutorial, as well as reset
a VM or baremetal node to a clean slate for developer testing.
---
playbooks/adhoc/tutorial-reset.yml | 46 ++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
create mode 100644 playbooks/adhoc/tutorial-reset.yml
(limited to 'playbooks')
diff --git a/playbooks/adhoc/tutorial-reset.yml b/playbooks/adhoc/tutorial-reset.yml
new file mode 100644
index 000000000..1ceb72d19
--- /dev/null
+++ b/playbooks/adhoc/tutorial-reset.yml
@@ -0,0 +1,46 @@
+# This deletes *ALL* Docker images, and uninstalls OpenShift and
+# Atomic Enterprise RPMs. It is primarily intended for use
+# with the tutorial as well as for developers to reset state.
+
+- hosts:
+ - OSEv3:children
+
+ sudo: yes
+
+ tasks:
+ - service: name={{ item }} state=stopped
+ with_items:
+ - docker
+ - atomic-enterprise-master
+ - atomic-enterprise-node
+
+ - yum: name={{ item }} state=absent
+ with_items:
+ - openvswitch
+ - atomic-enterprise
+ - atomic-enterprise-master
+ - atomic-enterprise-node
+ - atomic-enterprise-sdn-ovs
+ - tuned-profiles-atomic-enterprise-node
+
+ - shell: systemctl reset-failed
+ changed_when: False
+
+ - shell: systemctl daemon-reload
+ changed_when: False
+
+ - shell: find /var/lib/atomic-enterprise/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true
+ changed_when: False
+
+ - file: path={{ item }} state=absent
+ with_items:
+ - /var/lib/atomic-enterprise
+ - /etc/sysconfig/atomic-enterprise
+ - /etc/atomic-enterprise
+ - /etc/openshift
+ - /var/lib/docker
+
+ - user: name={{ item }} state=absent remove=yes
+ with_items:
+ - alice
+ - joe
--
cgit v1.2.3
From c85b503d6f02514beb9ea73c6a12fe2ef1bfb25a Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Wed, 12 Aug 2015 09:48:44 -0400
Subject: Added /root/.kube to be deleted so that the stuff there does not
prevent a new install.
---
playbooks/adhoc/tutorial-reset.yml | 1 +
1 file changed, 1 insertion(+)
(limited to 'playbooks')
diff --git a/playbooks/adhoc/tutorial-reset.yml b/playbooks/adhoc/tutorial-reset.yml
index 1ceb72d19..77bc13b17 100644
--- a/playbooks/adhoc/tutorial-reset.yml
+++ b/playbooks/adhoc/tutorial-reset.yml
@@ -39,6 +39,7 @@
- /etc/atomic-enterprise
- /etc/openshift
- /var/lib/docker
+ - /root/.kube
- user: name={{ item }} state=absent remove=yes
with_items:
--
cgit v1.2.3
From 472ecf8ac4bd63556b91b70a779e2e738546f77c Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Thu, 13 Aug 2015 18:28:14 -0400
Subject: Renamed the file as it mainly applies to atomic enterprise.
---
.../adhoc/atomic_enterprise_tutorial_reset.yml | 47 ++++++++++++++++++++++
playbooks/adhoc/tutorial-reset.yml | 47 ----------------------
2 files changed, 47 insertions(+), 47 deletions(-)
create mode 100644 playbooks/adhoc/atomic_enterprise_tutorial_reset.yml
delete mode 100644 playbooks/adhoc/tutorial-reset.yml
(limited to 'playbooks')
diff --git a/playbooks/adhoc/atomic_enterprise_tutorial_reset.yml b/playbooks/adhoc/atomic_enterprise_tutorial_reset.yml
new file mode 100644
index 000000000..77bc13b17
--- /dev/null
+++ b/playbooks/adhoc/atomic_enterprise_tutorial_reset.yml
@@ -0,0 +1,47 @@
+# This deletes *ALL* Docker images, and uninstalls OpenShift and
+# Atomic Enterprise RPMs. It is primarily intended for use
+# with the tutorial as well as for developers to reset state.
+
+- hosts:
+ - OSEv3:children
+
+ sudo: yes
+
+ tasks:
+ - service: name={{ item }} state=stopped
+ with_items:
+ - docker
+ - atomic-enterprise-master
+ - atomic-enterprise-node
+
+ - yum: name={{ item }} state=absent
+ with_items:
+ - openvswitch
+ - atomic-enterprise
+ - atomic-enterprise-master
+ - atomic-enterprise-node
+ - atomic-enterprise-sdn-ovs
+ - tuned-profiles-atomic-enterprise-node
+
+ - shell: systemctl reset-failed
+ changed_when: False
+
+ - shell: systemctl daemon-reload
+ changed_when: False
+
+ - shell: find /var/lib/atomic-enterprise/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true
+ changed_when: False
+
+ - file: path={{ item }} state=absent
+ with_items:
+ - /var/lib/atomic-enterprise
+ - /etc/sysconfig/atomic-enterprise
+ - /etc/atomic-enterprise
+ - /etc/openshift
+ - /var/lib/docker
+ - /root/.kube
+
+ - user: name={{ item }} state=absent remove=yes
+ with_items:
+ - alice
+ - joe
diff --git a/playbooks/adhoc/tutorial-reset.yml b/playbooks/adhoc/tutorial-reset.yml
deleted file mode 100644
index 77bc13b17..000000000
--- a/playbooks/adhoc/tutorial-reset.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# This deletes *ALL* Docker images, and uninstalls OpenShift and
-# Atomic Enterprise RPMs. It is primarily intended for use
-# with the tutorial as well as for developers to reset state.
-
-- hosts:
- - OSEv3:children
-
- sudo: yes
-
- tasks:
- - service: name={{ item }} state=stopped
- with_items:
- - docker
- - atomic-enterprise-master
- - atomic-enterprise-node
-
- - yum: name={{ item }} state=absent
- with_items:
- - openvswitch
- - atomic-enterprise
- - atomic-enterprise-master
- - atomic-enterprise-node
- - atomic-enterprise-sdn-ovs
- - tuned-profiles-atomic-enterprise-node
-
- - shell: systemctl reset-failed
- changed_when: False
-
- - shell: systemctl daemon-reload
- changed_when: False
-
- - shell: find /var/lib/atomic-enterprise/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true
- changed_when: False
-
- - file: path={{ item }} state=absent
- with_items:
- - /var/lib/atomic-enterprise
- - /etc/sysconfig/atomic-enterprise
- - /etc/atomic-enterprise
- - /etc/openshift
- - /var/lib/docker
- - /root/.kube
-
- - user: name={{ item }} state=absent remove=yes
- with_items:
- - alice
- - joe
--
cgit v1.2.3
From 008aa1b39a8c27cf227c87cdf225182a18a992e6 Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Fri, 14 Aug 2015 17:26:45 -0400
Subject: Updated tutorial reset file and made following chages:
1. Included openshift clean up
2. Renamed file to atomic_openshift_tutorial_reset.yml
3. docker service is not not stopped
4. docker containers and images are removed
5. /etc/openshift-sdn are removed too now
---
.../adhoc/atomic_enterprise_tutorial_reset.yml | 47 ---------------
.../adhoc/atomic_openshift_tutorial_reset.yml | 68 ++++++++++++++++++++++
2 files changed, 68 insertions(+), 47 deletions(-)
delete mode 100644 playbooks/adhoc/atomic_enterprise_tutorial_reset.yml
create mode 100644 playbooks/adhoc/atomic_openshift_tutorial_reset.yml
(limited to 'playbooks')
diff --git a/playbooks/adhoc/atomic_enterprise_tutorial_reset.yml b/playbooks/adhoc/atomic_enterprise_tutorial_reset.yml
deleted file mode 100644
index 77bc13b17..000000000
--- a/playbooks/adhoc/atomic_enterprise_tutorial_reset.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# This deletes *ALL* Docker images, and uninstalls OpenShift and
-# Atomic Enterprise RPMs. It is primarily intended for use
-# with the tutorial as well as for developers to reset state.
-
-- hosts:
- - OSEv3:children
-
- sudo: yes
-
- tasks:
- - service: name={{ item }} state=stopped
- with_items:
- - docker
- - atomic-enterprise-master
- - atomic-enterprise-node
-
- - yum: name={{ item }} state=absent
- with_items:
- - openvswitch
- - atomic-enterprise
- - atomic-enterprise-master
- - atomic-enterprise-node
- - atomic-enterprise-sdn-ovs
- - tuned-profiles-atomic-enterprise-node
-
- - shell: systemctl reset-failed
- changed_when: False
-
- - shell: systemctl daemon-reload
- changed_when: False
-
- - shell: find /var/lib/atomic-enterprise/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true
- changed_when: False
-
- - file: path={{ item }} state=absent
- with_items:
- - /var/lib/atomic-enterprise
- - /etc/sysconfig/atomic-enterprise
- - /etc/atomic-enterprise
- - /etc/openshift
- - /var/lib/docker
- - /root/.kube
-
- - user: name={{ item }} state=absent remove=yes
- with_items:
- - alice
- - joe
diff --git a/playbooks/adhoc/atomic_openshift_tutorial_reset.yml b/playbooks/adhoc/atomic_openshift_tutorial_reset.yml
new file mode 100644
index 000000000..91159ad8e
--- /dev/null
+++ b/playbooks/adhoc/atomic_openshift_tutorial_reset.yml
@@ -0,0 +1,68 @@
+# This deletes *ALL* Docker images, and uninstalls OpenShift and
+# Atomic Enterprise RPMs. It is primarily intended for use
+# with the tutorial as well as for developers to reset state.
+
+- hosts:
+ - OSEv3:children
+
+ sudo: yes
+
+ tasks:
+ - service: name={{ item }} state=stopped
+ with_items:
+ - openshift-master
+ - openshift-node
+ - openvswitch
+ - atomic-enterprise-master
+ - atomic-enterprise-node
+
+ - yum: name={{ item }} state=absent
+ with_items:
+ - openvswitch
+ - atomic-enterprise
+ - atomic-enterprise-master
+ - atomic-enterprise-node
+ - atomic-enterprise-sdn-ovs
+ - tuned-profiles-atomic-enterprise-node
+ - openshift
+ - openshift-master
+ - openshift-node
+ - openshift-sdn-ovs
+ - tuned-profiles-openshift-node
+
+ - shell: systemctl reset-failed
+ changed_when: False
+
+ - shell: systemctl daemon-reload
+ changed_when: False
+
+ - shell: find /var/lib/atomic-enterprise/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true
+ changed_when: False
+
+ - shell: find /var/lib/openshift/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true
+ changed_when: False
+
+ - shell: docker ps -a -q | xargs docker stop
+ changed_when: False
+
+ - shell: docker ps -a -q| xargs docker rm
+ changed_when: False
+
+ - shell: docker images -q |xargs docker rmi
+ changed_when: False
+
+ - file: path={{ item }} state=absent
+ with_items:
+ - /var/lib/atomic-enterprise
+ - /etc/sysconfig/atomic-enterprise
+ - /etc/atomic-enterprise
+ - /etc/openshift
+ - /etc/openshift-sdn
+ - /root/.kube
+ - /etc/sysconfig/openshift
+ - /var/lib/openshift
+
+ - user: name={{ item }} state=absent remove=yes
+ with_items:
+ - alice
+ - joe
--
cgit v1.2.3
From 0e94fa986dd928888c36d2fbef71359c0b9b05d2 Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Mon, 17 Aug 2015 11:01:41 -0400
Subject: Updated to include origin and atomic-openshift RPMs re-factoring to
include all origin, AE and openshift products. For back-word compatibility,
older openshift and AE naming is retained too.
---
.../adhoc/atomic_openshift_tutorial_reset.yml | 37 ++++++++++++++++++----
1 file changed, 31 insertions(+), 6 deletions(-)
(limited to 'playbooks')
diff --git a/playbooks/adhoc/atomic_openshift_tutorial_reset.yml b/playbooks/adhoc/atomic_openshift_tutorial_reset.yml
index 91159ad8e..1200caa2a 100644
--- a/playbooks/adhoc/atomic_openshift_tutorial_reset.yml
+++ b/playbooks/adhoc/atomic_openshift_tutorial_reset.yml
@@ -10,15 +10,29 @@
tasks:
- service: name={{ item }} state=stopped
with_items:
+ - openvswitch
+ - origin-master
+ - origin-node
+ - atomic-openshift-master
+ - atomic-openshift-node
- openshift-master
- openshift-node
- - openvswitch
- atomic-enterprise-master
- atomic-enterprise-node
- yum: name={{ item }} state=absent
with_items:
- openvswitch
+ - origin
+ - origin-master
+ - origin-node
+ - origin-sdn-ovs
+ - tuned-profiles-origin-node
+ - atomic-openshift
+ - atomic-openshift-master
+ - atomic-openshift-node
+ - atomic-openshift-sdn-ovs
+ - tuned-profiles-atomic-openshift-node
- atomic-enterprise
- atomic-enterprise-master
- atomic-enterprise-node
@@ -36,6 +50,9 @@
- shell: systemctl daemon-reload
changed_when: False
+ - shell: find /var/lib/origin/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true
+ changed_when: False
+
- shell: find /var/lib/atomic-enterprise/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true
changed_when: False
@@ -53,14 +70,22 @@
- file: path={{ item }} state=absent
with_items:
- - /var/lib/atomic-enterprise
- - /etc/sysconfig/atomic-enterprise
- - /etc/atomic-enterprise
- - /etc/openshift
- /etc/openshift-sdn
- /root/.kube
- - /etc/sysconfig/openshift
+ - /etc/origin
+ - /etc/atomic-enterprise
+ - /etc/openshift
+ - /var/lib/origin
- /var/lib/openshift
+ - /var/lib/atomic-enterprise
+ - /etc/sysconfig/origin-master
+ - /etc/sysconfig/origin-node
+ - /etc/sysconfig/atomic-openshift-master
+ - /etc/sysconfig/atomic-openshift-node
+ - /etc/sysconfig/openshift-master
+ - /etc/sysconfig/openshift-node
+ - /etc/sysconfig/atomic-enterprise-master
+ - /etc/sysconfig/atomic-enterprise-node
- user: name={{ item }} state=absent remove=yes
with_items:
--
cgit v1.2.3
From 3c3669ccf9bacd69a222cdb45a0c377da0ce090a Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Wed, 19 Aug 2015 13:21:20 -0400
Subject: remove fstab entry after pv creation
---
playbooks/adhoc/create_pv/create_pv.yaml | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'playbooks')
diff --git a/playbooks/adhoc/create_pv/create_pv.yaml b/playbooks/adhoc/create_pv/create_pv.yaml
index 684a0ca72..591b1d902 100644
--- a/playbooks/adhoc/create_pv/create_pv.yaml
+++ b/playbooks/adhoc/create_pv/create_pv.yaml
@@ -118,6 +118,13 @@
state: unmounted
fstype: ext4
+ - name: remove from fstab
+ mount:
+ name: "{{ pv_mntdir }}"
+ src: "{{ cli_device_name }}"
+ state: absent
+ fstype: ext4
+
- name: detach drive
delegate_to: localhost
ec2_vol:
--
cgit v1.2.3
From 0dc89f3583a5e88e1ca66780e974bc9520910410 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Wed, 19 Aug 2015 17:20:26 -0400
Subject: Added tagging to the pv volumes
---
playbooks/adhoc/create_pv/create_pv.yaml | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'playbooks')
diff --git a/playbooks/adhoc/create_pv/create_pv.yaml b/playbooks/adhoc/create_pv/create_pv.yaml
index 591b1d902..4f0ef7a75 100644
--- a/playbooks/adhoc/create_pv/create_pv.yaml
+++ b/playbooks/adhoc/create_pv/create_pv.yaml
@@ -50,6 +50,16 @@
- debug: var=vol
+ - name: tag the vol with a name
+ ec2_tag: region={{ hostvars[oo_name]['ec2_region'] }} resource={{vol.volume_id}}
+ args:
+ tags:
+ Name: "pv-{{ hostvars[oo_name]['ec2_tag_Name'] }}"
+ env: "{{cli_environment}}"
+ register: voltags
+
+ - debug: var=voltags
+
- name: Configure the drive
gather_facts: no
hosts: oo_master
--
cgit v1.2.3
From 49923edfba6d396140881d6a920e83f9ecf79f77 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 20 Aug 2015 11:44:27 -0400
Subject: fixed zbx_user. Update password playbook added
---
playbooks/adhoc/zabbix_setup/create_user.yml | 31 ++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 playbooks/adhoc/zabbix_setup/create_user.yml
(limited to 'playbooks')
diff --git a/playbooks/adhoc/zabbix_setup/create_user.yml b/playbooks/adhoc/zabbix_setup/create_user.yml
new file mode 100644
index 000000000..dd74798b7
--- /dev/null
+++ b/playbooks/adhoc/zabbix_setup/create_user.yml
@@ -0,0 +1,31 @@
+---
+# export PYTHONPATH='/usr/lib/python2.7/site-packages/:/home/kwoodson/git/openshift-tools'
+# ansible-playbook -e 'cli_password=zabbix' -e 'cli_new_password=new-zabbix' create_user.yml
+- hosts: localhost
+ gather_facts: no
+ vars_files:
+ - vars/template_heartbeat.yml
+ - vars/template_os_linux.yml
+ vars:
+ g_zserver: http://localhost/zabbix/api_jsonrpc.php
+ g_zuser: admin
+ g_zpassword: "{{ cli_password }}"
+ roles:
+ - ../../../roles/os_zabbix
+ post_tasks:
+ - zbx_user:
+ server: "{{ g_zserver }}"
+ user: "{{ g_zuser }}"
+ password: "{{ g_zpassword }}"
+ state: list
+ register: users
+
+ - debug: var=users
+
+ - name: Update zabbix creds for admin
+ zbx_user:
+ server: "{{ g_zserver }}"
+ user: "{{ g_zuser }}"
+ password: "{{ g_zpassword }}"
+ alias: Admin
+ passwd: "{{ cli_new_password | default(g_zpassword, true) }}"
--
cgit v1.2.3