add storage volume to openstack install

openstack/ansible/ose3-prep-nodes.yml

@@ -3,9 +3,9 @@
   sudo: yes
   tasks:
     - name: disable all repos by default
-      shell: subscription-manager repos --disable="*"      
+      shell: subscription-manager repos --disable="*"
     - name: Enable the requisite rhel7 repos
-      shell: subscription-manager repos --enable="rhel-7-server-rpms" --enable="rhel-7-server-extras-rpms" --enable="rhel-7-server-optional-rpms" --enable="rhel-7-server-ose-3.0-rpms"
+      shell: subscription-manager repos --enable="rhel-7-server-rpms" --enable="rhel-7-server-extras-rpms" --enable="rhel-7-server-optional-rpms" --enable="rhel-7-server-ose-3.2-rpms"
     - name: Import keys
       rpm_key: state=present key=/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
     - name: Remove Network Manager
@@ -23,10 +23,15 @@
           - tmux
     - name: Update all yum packages
       yum: name=* state=latest
+    - name: Make filesystem from block device
+      filesystem: fstype=ext3 dev=/dev/vdb
+    - name: Make /var/lib/docker
+      file: path=/var/lib/docker state=directory mode=0755
+    - name: mount block device to /var/lib/docker
+      mount: name=/var/lib/docker src=/dev/vdb state=mounted fstype=ext3
     - name: Install Docker
       yum: name=docker state=present
     - name: Enable insecure registry... since we like insecure things
-      lineinfile: dest=/etc/sysconfig/docker state=present line='OPTIONS=--insecure-registry 172.30.0.0/16' regexp="^#?OPTIONS" 
+      lineinfile: dest=/etc/sysconfig/docker state=present line='OPTIONS=--insecure-registry 172.30.0.0/16' regexp="^#?OPTIONS"
     - name: Start docker
       service: name=docker state=started enabled=yes
-

openstack/enterprise-inventory

@@ -0,0 +1,35 @@
+# Create an OSEv3 group that contains the masters and nodes groups
+[OSEv3:children]
+masters
+nodes
+
+# Set variables common for all OSEv3 hosts
+[OSEv3:vars]
+# SSH user, this user should allow ssh based auth without requiring a password
+ansible_ssh_user=cloud-user
+
+# If ansible_ssh_user is not root, ansible_sudo must be set to true
+ansible_sudo=true
+
+product_type=openshift
+deployment_type=enterprise
+#openshift_pkg_version=-1.0.5
+#openshift_pkg_version=-3.0.1.0
+openshift_master_cluster_public_hostname=master.fuse.osecloud.com
+
+
+# uncomment the following to enable htpasswd authentication; defaults to DenyAllPasswordIdentityProvider
+openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/openshift/openshift-passwd'}]
+osm_default_subdomain=apps.fuse.osecloud.com
+#osm_default_subdomain=apps.fabric8.osecloud.com
+
+# host group for masters
+[masters]
+master.rhcloud.com openshift_public_hostname=master.fuse.osecloud.com
+
+# host group for nodes, includes region info
+[nodes]
+master.rhcloud.com openshift_node_labels="{'region': 'infra', 'zone': 'default'}"
+node0.rhcloud.com openshift_node_labels="{'region': 'primary', 'zone': 'east'}"
+
+

openstack/main.tf

@@ -117,6 +117,18 @@ resource "openstack_compute_floatingip_v2" "os3-node-floatip" {
   pool = "os1_public"
 }
 
+
+resource "openstack_blockstorage_volume_v1" "master-docker-vol" {
+  name = "mastervol"
+  size = 75
+}
+
+resource "openstack_blockstorage_volume_v1" "node-docker-vol" {
+  count = "${var.num_nodes}"
+  name = "${concat("node-docker-vol", count.index)}"
+  size = 75
+}
+
 resource "openstack_compute_instance_v2" "ose-master" {
   name = "os3-master"
   region = "${var.openstack_region}"
@@ -129,6 +141,9 @@ resource "openstack_compute_instance_v2" "ose-master" {
   metadata {
     ssh_user = "cloud-user"
   }
+  volume {
+    volume_id = "${openstack_blockstorage_volume_v1.master-docker-vol.id}"
+  }
 }
 
 resource "openstack_compute_instance_v2" "ose-node" {
@@ -144,4 +159,8 @@ resource "openstack_compute_instance_v2" "ose-node" {
   metadata {
     ssh_user = "cloud-user"
   }
+  volume {
+    volume_id = "${element(openstack_blockstorage_volume_v1.node-docker-vol.*.id, count.index)}"
+
+  }
 }