Merge remote-tracking branch 'origin/master'

control-server.yml

diff --git a/control-server.yml b/control-server.yml
index 5449850..de25fe3 100644
--- a/control-server.yml
+++ b/control-server.yml
@@ -1,78 +1,38 @@
 ---
-- include: configuration/update-user.yml
-  vars:
-    hosts: '{{ hosts }}'
-    user: 'root'
-  tags:
-  - root-user
-
 - hosts: '{{ hosts }}'
   become: yes
+  become_flags: "beroot"
   vars_files:
-  - ~/.apigee/credentials.yml
+  - custom-properties.yml
   tasks:
   - name: Install system packages
-    yum:
-      name: '{{ item }}'
+    yum :
+      name: "{{ item }}"
       state: present
     with_items:
-    - python-devel
-    - openssl-devel
-    - libffi-devel
     - gcc
-    - vim
-    - git
-    - elasticache-auto-discovery
-    when: ansible_os_family | lower == 'redhat'
 
-  - name: Install pip
-    easy_install:
-      name: pip
-      state: latest
+  - name: Create pip config folder
+    file:
+      path: "{{ pip_conf_dir }}"
+      state: directory
 
-  - name: Install ansible
+  - name: Configure pip
+    template:
+      src: resources/pip.conf.j2
+      dest: "{{ pip_conf_dir }}/pip.conf"
+    when: pip_conf_dir is defined and pip_index_url is defined
+
+  - name: Install pip packages
     pip:
       name: '{{ item }}'
       state: latest
     register: result
     with_items:
-    - pyOpenSSL
-    - ndg-httpsclient
-    - pyasn1
+    - pip
     - ansible
-
-  - name: Install ansible playbook setup
-    become: no
-    git:
-      repo: https://github.com/carlosfrias/apigee-opdk-playbook-setup-ansible.git
-      dest: ~/apigee-workspace/apigee-opdk-playbook-setup-ansible
-
-  - name: Configure ansible playbook setup
-    become: no
-    shell: 'ansible-playbook setup.yml'
-    args:
-      chdir: ~/apigee-workspace/apigee-opdk-playbook-setup-ansible
-
-  - name: Configure ansible playbook setup - ec2
-    become: no
-    shell: 'ansible-playbook setup-ec2.yml'
-    args:
-      chdir: ~/apigee-workspace/apigee-opdk-playbook-setup-ansible
-
-  - name: Setup installation single region
-    become: no
-    git:
-      repo: https://github.com/carlosfrias/apigee-opdk-playbook-installation-single-region.git
-      dest: ~/apigee-workspace/apigee-opdk-playbook-setup-ansible
-
-  - name: Setup installation two region
-    become: no
-    git:
-      repo: https://github.com/carlosfrias/apigee-opdk-playbook-installation-two-regions.git
-      dest: ~/apigee-workspace/apigee-opdk-playbook-setup-ansible
-
-  - name: Setup installation three region
-    become: no
-    git:
-      repo: https://github.com/carlosfrias/apigee-opdk-playbook-installation-third-region.git
-      dest: ~/apigee-workspace/apigee-opdk-playbook-setup-ansible
+#    - markupsafe
+#    - boto
+#    environment:
+#      http_proxy: "{{ http_proxy }}"
+#      https_proxy: "{{ https_proxy }}"

resources/custom-properties.yml

diff --git a/resources/custom-properties.yml b/resources/custom-properties.yml
new file mode 100644
index 0000000..449105f
--- /dev/null
+++ b/resources/custom-properties.yml
@@ -0,0 +1,20 @@
+---
+opdk_version: 4.17.01
+# pip_index_url: https://pip.artifactory-server.com/artifactory/api/pypi/Pypi-remote/simple
+# pip_conf_dir: ~/.pip
+
+# Used with restarting servers
+# start_check_delay: 0
+# server_restart_timeout: 1
+
+# Used for creating softlinks from apigee system folders to customer hard targets
+# target_links:
+#- { src: '/apps/opt/apigee', dest: '/opt/apigee' }
+
+# Used for proxy settings when required
+# http_proxy: http://proxy.com:80
+# https_proxy: https://proxy.com:80
+
+# Used to temporarily move and restore system files in order to enable installation of components.
+# temporary_move:
+# - { original_folder: "/etc/yum.repos.d", file_name: "redhat.repo", temporary_holding_folder: "/tmp/yum.repos.d" }

resources/pip.conf.j2

diff --git a/resources/pip.conf.j2 b/resources/pip.conf.j2
new file mode 100644
index 0000000..c4f0766
--- /dev/null
+++ b/resources/pip.conf.j2
@@ -0,0 +1,2 @@
+[global]
+index-url = {{ pip_index_url }}